From 31c63455e1a1c70c9c07094f2d62f26e9119a3c1 Mon Sep 17 00:00:00 2001
From: Piotr Mitros <pmitros@mit.edu>
Date: Mon, 13 Feb 2012 16:42:38 -0500
Subject: [PATCH 1/4] Slightly better text

---
 mitx_help.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mitx_help.html b/mitx_help.html
index e67fd1255d..ab0c28a23e 100644
--- a/mitx_help.html
+++ b/mitx_help.html
@@ -4,7 +4,8 @@
   <div>
     <section class="help-email">
       <h2>Help &amp; Feedback</h2>
-      <p> If run into any problems, we have several e-mail addresses set up:</p>
+      <p> If run into problems signing up for the web site which you
+      cannot resolve on your own, you can reach us at:</p>
       <dl>
         <dt>System-related questions</dt>
         <dd><a href="mailto:technical@mitx.mit.edu">technical@mitx.mit.edu</a></dd>

From 647407ad45a2c25ac5e7b801d2f27fec5aa68ff9 Mon Sep 17 00:00:00 2001
From: Piotr Mitros <pmitros@mit.edu>
Date: Mon, 13 Feb 2012 17:20:33 -0500
Subject: [PATCH 2/4] hg ignore update

---
 .hgignore | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.hgignore b/.hgignore
index c93aa7128d..e2ae8c91cb 100644
--- a/.hgignore
+++ b/.hgignore
@@ -5,3 +5,5 @@ syntax: glob
 *.swp
 *.orig
 *.DS_Store
+#*
+.#*
\ No newline at end of file

From 56858e6498ec855f3b5921e8f710f1f8f24d4ae4 Mon Sep 17 00:00:00 2001
From: Piotr Mitros <pmitros@mit.edu>
Date: Mon, 13 Feb 2012 18:42:13 -0500
Subject: [PATCH 3/4] Undid Kyle's Chrome bug fix, since it resulted in worse
 Firefox bugs

---
 sass/_index.scss | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/sass/_index.scss b/sass/_index.scss
index 0c7360f015..d579eb8ea6 100644
--- a/sass/_index.scss
+++ b/sass/_index.scss
@@ -53,6 +53,13 @@ header.announcement {
   &.home {
     background: #e3e3e3 url("/static/images/marketing/shot-5-medium.jpg");
 
+    @media screen and (min-width: 1200px) {
+      background: #e3e3e3 url("/static/images/marketing/shot-5-large.jpg");
+    }
+
+    // @media screen and (max-width: 1199px) {
+    // }
+
     div {
       padding: lh(10) lh() lh(3);
 

From e3e1a37bc27d0876e0a0b204eef22df98a1ebe7c Mon Sep 17 00:00:00 2001
From: Piotr Mitros <pmitros@mit.edu>
Date: Mon, 13 Feb 2012 20:24:08 -0500
Subject: [PATCH 4/4] Missed commit for custom tags

---
 custom_tags | 1 +
 1 file changed, 1 insertion(+)
 create mode 120000 custom_tags

diff --git a/custom_tags b/custom_tags
new file mode 120000
index 0000000000..ec1dac8fbe
--- /dev/null
+++ b/custom_tags
@@ -0,0 +1 @@
+../data/custom_tags
\ No newline at end of file