resolve conflicts again ...

diff --cc public/index.html
index 385171c0fc8075bd690f8ba283f2db9113a2cc2d,d2e188391706a86b6879f524e5a389140825b798..40e4236df01dd046d8c90ed21d21cd65816d2f64
--- 1/public/index.html
--- 2/public/index.html
+++ b/public/index.html
@@@ -51,8 -52,72 +50,7 @@@
                <div id="topofcontent"></div>
                <div id="messages" class="page"><span id="PROTO_message" class="__type__">__msg__</span></div>
                <div class="content">
 -                      <div class="container-12">
 -
 -              <div id="messages" class="page">
 -                      <div id="PROTO_message" class="__type__">__msg__</div>
 -              </div>
 -
 -                      <!--
 -                      ***********************************************************
 -                              <div class="grid-12">
 -                                      <div class="padded-loose">
 -                                              <h1 class="large-huge spaced centered">Welcome to FinalsClub! <span class="small">Collaborate. Learn. Share.</span></h1>
 -                                      </div>
 -                              </div>
 -                              <div class="grid-10 grid-centered">
 -                                      <div class="padded-loose">
 -                                              <p class="no-top-margin">
 -                                                      Thank you for visiting FinalsClub.org, a 501(c)(3) non-profit open education
 -                                                      project dedicated to helping college students share knowledge freely online.  While you learn better, faster, and smarter by using FinalsClub with your classmates,
 -                                                      we also encourage you to share your scholarship to benefit curious minds everywhere.
 -                                              </p>
 -                                              <p>
 -                                                      Getting started is easy.  Just register with your school email address and confirm
 -                                                      your account.  Then find your courses or add a new ones.  You can also browse our
 -                                                      Library to learn something new.  Thank you for helping us improve access to education,
 -                                                      one lecture at a time.
 -                                              </p>
 -                                      </div>
 -                              </div>
 -                              <div class="grid-12">
 -                                      <div class="button-set vertical half-width centered-rt-parent half-width-buttons">
 -                                              <button class="green">Sign Up</button>
 -                                              <button class="blue">Learn Something</button>
 -                                      </div>
 -                              </div>
 -                      </div>
 -                      <div class="container-12 spacer">
 -                        <hr class="stripes spacer" />
 -
 -                              <div class="grid-6">
 -                                      <h3 class="heading">Check out our Screencasts</h3>
 -                                      <div class="video-wrapper">
 -                                              <iframe src="http://player.vimeo.com/video/30647271?title=0&amp;byline=0&amp;portrait=0&amp;color=367da9" width="460" height="259" frameborder="0" webkitAllowFullScreen allowFullScreen></iframe>              </div>
 -                                      </div>
 -                              <div class="grid-6">
 -                                      <h3 class="heading">We currently support the following schools</h3>
 -                                      <div class="schools">
 -                                              <ul>
 -                                                      <li><em class="sprite-school brown">Brown Logo</em></li>
 -                                                      <li><em class="sprite-school columbia">Columbia Logo</em></li>
 -                                                      <li><em class="sprite-school cornell">Cornell Logo</em></li>
 -                                                      <li><em class="sprite-school dartmouth">Dartmouth Logo</em></li>
 -                                                      <li><em class="sprite-school shield">School Logo</em></li>
 -                                                      <li><em class="sprite-school mit">MIT Logo</em></li>
 -                                                      <li><em class="sprite-school lock_haven">Lock Haven Logo</em></li>
 -                                                      <li><em class="sprite-school cal">Cal Tech Logo</em></li>
 -                                                      <li><em class="sprite-school texas">University of Texas Logo</em></li>
 -                                                      <li><em class="sprite-school yale">Yale Logo</em></li>
 -                                                      <li><em class="sprite-school penn">Penn Logo</em></li>
 -                                                      <li><em class="sprite-school harvard">Harvad Logo</em></li>
 -                                              </ul>
 -                                      </div>
 -                              </div>
 -                      </div>
 -                      ***********************************************************
 -                      -->
  
- 
                        <style>
                                /* The is here is because it's related less to "styling" and more to UI "behavior" */
                                .page { display: none; }