Mofied index.html to merge issues.

diff --cc 2018/index.html
index 6c90b2b867dd1206a56211d28c6460d3eca5b9b7,eec92c9b3042ce34d98164073365faf9be0e1b28..df1a6a2836564aac85861fda9bd29f7921cec7f3
--- 1/2018/index.html
--- 2/2018/index.html
+++ b/2018/index.html
@@@ -11,40 -12,30 +12,30 @@@
        <!-- wrapper for slides -->
        <ul class="carousel-inner list-unstyled">
  
-               <li class="item active">
-                       <img src="http://static.fsf.org/nosvn/libreplanet/2018/assets/banner_no_year.svg"
-                       alt="[ Libreplanet logo, consisting of several stars and connected green planets and the text "LibrePlanet" ]">
- <<<<<<< HEAD
-                       <p class="carousel-caption-bottom" style="background-color: white;"><br></p>
-                       </li>
-                               <li class="item">
-                               <img src="//static.fsf.org/nosvn/libreplanet/2014/site/carousel/gnu30_hackers.jpg"
-                               alt="[ Hackers at the GNU 30th anniversary hackathon ]">
- =======
-               </li>
 -        <li class="item active">
 -          <img src="//static.fsf.org/nosvn/libreplanet/2014/site/carousel/gnu30_hackers.jpg"
 -               alt="[ Apply for a scholarship ]"></img>
 -          <p class="carousel-caption-bottom">
 -            <a href="https://www.libreplanet.org/2017/scholarship_donation">donate to the scholarship fund</a> to help us bring new people to LibrePlanet.
 -</p>
 -</li>
 +                      
-               <li class="item">
++              <li class="item active">
 +                              <img src="//static.fsf.org/nosvn/libreplanet/2014/site/carousel/gnu30_hackers.jpg"
 +                              alt="[ A photo of people in a room on laptops. They are sitting at desks, with a clean blackboard in the background on one wall, and on the other written on a bloackboard is the text "Installation Feedback." Several of the people have long hair, and one woman's hair is pink and yellow. ]">
- >>>>>>> master
 +                              <p class="carousel-caption-bottom"><a href="https://my.fsf.org/civicrm/contribute/transact?reset=1&id=33">Donate to the scholarship fund</a> to help us bring new people to LibrePlanet.
 +                      </p>
 +              </li>
  
-       <!--            <li class="item">
-                       <img src="//static.fsf.org/nosvn/libreplanet/feature-images/libreluna-feature.png"
-                       alt="[ Can't come to the conference? Host a LibreLuna viewing party. ]">
-                       <p class="carousel-caption-bottom">
-                       <a href="https://my.fsf.org/civicrm/event/register?id=67&reset=1">Register your party</a> with the FSF.</p>
-               </li>
+         <li class="item">
+           <img src="//static.fsf.org/nosvn/libreplanet/2014/site/carousel/volunteer_helping.jpg" 
+                alt="[ A presentation at LibrePlanet 2013]">
+           <p class="carousel-caption-center">
+             Volunteers keep LibrePlanet spinning <br>(and get great perks as well).<br>
+             <a href="https://libreplanet.org/2018/volunteer">Join us today.</a>
+ </p>
  
                <li class="item">
-                       <a href="https://shop.fsf.org/tshirts-hoodies/libreplanet-2017"><img src="https://static.fsf.org/nosvn/libreplanet/2017/lp2017-shirt/lp2017-shirt-feature.png"
-                       alt="[ The LibrePlanet shirt. The shirt is red with the text 'Roots of Freedom' and a design in tan. ]">
-                       <p class="carousel-caption-bottom" style="background-color: white;"><br></p></a>
-               </li>
- 
-                               </ul> -->
+                       <img src="https://static.fsf.org/nosvn/libreplanet/feature-images/sumana-speaking-with-cables.png"
+                       alt="[ Sumana Harihareswara speaking at a podium at LibrePlanet 2016. Between her and the camera is a table strewn with cables and computer equipment. ]">
+                       <p class="carousel-caption-bottom">
+                               Explore a wealth of <a href="https://www.libreplanet.org/2017/program/index.html">session videos and slides</a> from LibrePlanet 2017.</p></a>
+ </li>
+                               </ul>
+ </div>
  
                                <!-- CAROUSEL FEATURES THAT HAVE BEEN COMMENTED OUT. Their formatting might not be quite right, but reusing them is much faster than making them from scratch.
                                <li class="item">
@@@ -173,8 -156,22 +156,20 @@@ alt="[ Keynote speakers]"
  Get excited for our keynote speakers!
  </a></p>
  </li>
- -->
+ 
+               <!--<li class="item">
+                       <a href="https://shop.fsf.org/tshirts-hoodies/libreplanet-2017"><img src="https://static.fsf.org/nosvn/libreplanet/2017/lp2017-shirt/lp2017-shirt-feature.png"
+                       alt="[ The LibrePlanet shirt. The shirt is red with the text 'Roots of Freedom' and a design in tan. ]"></img>
+                       <p class="carousel-caption-bottom" style="background-color: white;"><br></p></a>
+               </li> 
+ 
+                       <li class="item">
+                       <img src="//static.fsf.org/nosvn/libreplanet/feature-images/libreluna-feature.png"
+                       alt="[ Can't come to the conference? Host a LibreLuna viewing party. ]">
+                       <p class="carousel-caption-bottom">
+                       <a href="https://my.fsf.org/civicrm/event/register?id=67&reset=1">Register your party</a> with the FSF.</p>
+               </li> -->
  
 --->
 -
  
  <!-- These are the controls for the carousel. Comment them in if you want the little navigation chevrons and the skrims that appear when you mouse over the edges of the active image.-->