fixes merge conflict

diff --cc docs/pages/sass-guide.md
Simple merge

diff --cc docs/partials/component-list.html
Simple merge

diff --cc docs/partials/footer.html
index f60d1eb9eb1a475e4889f385d57eaa407088cf60,de01586404fa79f84f1eb891edbf5ebca1e00d48..f344f78cba185e7abb25f166f7d1ac266f162ddb
--- 1/docs/partials/footer.html
--- 2/docs/partials/footer.html
+++ b/docs/partials/footer.html
@@@ -93,13 -73,13 +73,13 @@@
    <div class="row">
      <div class="medium-4 medium-push-8 columns">
        <ul class="home-social">
-           <li><a href="http://www.youtube.com/ZURB" class="youtube"></a></li>
-           <li><a href="http://www.twitter.com/ZURB" class="twitter"></a></li>
-           <li><a href="http://www.facebook.com/ZURB" class="facebook"></a></li>
-           <li><a href="http://zurb.com/contact" class="mail"></a></li>
-         </ul>
+         <li><a href="http://www.youtube.com/ZURB" class="youtube"></a></li>
+         <li><a href="http://www.twitter.com/ZURB" class="twitter"></a></li>
+         <li><a href="http://www.facebook.com/ZURB" class="facebook"></a></li>
+         <li><a href="http://zurb.com/contact" class="mail"></a></li>
+       </ul>
 -    </div>
 -    <div class="medium-8 medium-pull-4 columns">
 +     </div>
 +     <div class="medium-8 medium-pull-4 columns">
          <a href="http://www.zurb.com" class="zurb-logo regular"></a>
          <ul class="zurb-links">
            <li><a href="http://zurb.com/about">About</a></li>

diff --cc templates/hero.html
Simple merge

diff --cc templates/sidebar-hero.html
Simple merge