# HG changeset patch
# User Brian Neal <bgneal@gmail.com>
# Date 1488937638 21600
# Node ID 44e55e4317f848b62056ab6fd4761e73dfe03fe3
# Parent  a60aabced3462d0e21dc962f164446cf5ee10c78# Parent  d551b60042137e1af47681e870b65a65e21ed875
Merge with mainline.

diff -r a60aabced346 -r 44e55e4317f8 sg101/templates/base.html
--- a/sg101/templates/base.html	Tue Feb 07 20:44:00 2017 -0600
+++ b/sg101/templates/base.html	Tue Mar 07 19:47:18 2017 -0600
@@ -94,9 +94,8 @@
 
 <div id="content-primary" class="span-19 last">
    <div>
-      <a href="/forums/topic/27440/">
-         <img src="{% static "images/10yearsSG101-Rob_J.jpg" %}" alt="SG101 Turns 10 Years Old!"
-            title="SG101 Turns 10 Years Old!"/></a>
+      <img src="{% static "images/2006-2017.jpg" %}" alt="SG101 2006-2017"
+         title="SG101 2006-2017"/>
    </div>
    {% cache 3600 countdown_v2 %}
       {% countdown_events %}
diff -r a60aabced346 -r 44e55e4317f8 sg101/templates/v3/base.html
--- a/sg101/templates/v3/base.html	Tue Feb 07 20:44:00 2017 -0600
+++ b/sg101/templates/v3/base.html	Tue Mar 07 19:47:18 2017 -0600
@@ -70,9 +70,8 @@
       <a href="/"><img src="{% static "images/v3-logo.png" %}" alt="SG101 logo"></a>
    </div>
    <div class="small-8 columns">
-      <a href="/forums/topic/27440/">
-      <img src="{% static "images/10yearsSG101-Rob_J.jpg" %}" alt="SG101 Turns 10 Years Old!"
-            title="SG101 Turns 10 Years Old!"/></a>
+      <img src="{% static "images/2006-2017.jpg" %}" alt="SG101 2006-2017"
+         title="SG101 2006-2017"/>
    </div>
 </div>
 <div class="row show-for-medium">
@@ -98,9 +97,8 @@
     <li class="orbit-slide">
       <div class="row align-center hide-for-medium">
          <div class="small-12 columns">
-            <a href="/forums/topic/27440/">
-            <img src="{% static "images/10yearsSG101-Rob_J.jpg" %}" alt="SG101 Turns 10 Years Old!"
-                  title="SG101 Turns 10 Years Old!"/></a>
+            <img src="{% static "images/2006-2017.jpg" %}" alt="SG101 2006-2017"
+               title="SG101 2006-2017"/>
          </div>
       </div>
     </li>
diff -r a60aabced346 -r 44e55e4317f8 static/images/2006-2017.jpg
Binary file static/images/2006-2017.jpg has changed