Fixing conflicts in header.

diff --cc 2015/header.html
index 452464bc51823f253ca5f13645b138d0828c18cd,2cfdf42bfc85cb323ee7dfe2a9a93c4f70dd75c8..c99350c3747991932573d4dc344078b1b39988f3
--- 1/2015/header.html
--- 2/2015/header.html
+++ b/2015/header.html
@@@ -124,9 -122,9 +124,10 @@@
              </ul>
  
              <ul class="nav nav-pills nav-stacked">
 -              <li><a href="/2015/logistics">Getting around Cambridge</a></li>
 +              <li><a href="/2015/getting_around">Getting around Cambridge</a></li>
                <!--<li><a href="/2015/scholarships">Scholarships (until January 10th)</a></li>-->
 -              <li><a href="/2015/volunteer">Volunteer</a></li>
 +              <!--<li><a href="/2015/live">Participate online</a></li>-->
++
                <li><a href="/2015/scholarship_donation">Donate to the scholarship fund</a></li>
              </ul>
  
@@@ -136,8 -134,12 +137,10 @@@
                  Share your ideas
                  </a>
                </li>
 -              <li>
 -                <a href="https://libreplanet.org/wiki/LibrePlanet:Conference">
 -                Previous conferences
 -                </a>
 -              </li>
++
 +              <li><a href="http://media.libreplanet.org/">Videos of previous conferences</a></li>
 +
+               <li><a href="http://media.libreplanet.org/">LibrePlanet 2013 videos</a></li>
                <li><a href="/2015/anti-harassment/">Anti-harassment policy</a></li>
                <li class="fsf-donate">
                  <a href="https://my.fsf.org/associate/support_freedom">