Merge with default

--HG--
branch : close_sidebar

.hgignore

@@ -5,3 +5,5 @@ syntax: glob
 *.swp
 *.orig
 *.DS_Store
+#*
+.#*
\ No newline at end of file

custom_tags

+../data/custom_tags
\ No newline at end of file

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>

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);