# HG changeset patch
# User Brian Neal <bgneal@gmail.com>
# Date 1454899443 21600
# Node ID 61abc6f6530cbaa5101584a01347dce7691b4dc7
# Parent  5d208c3321ceb8fe1accc162ec0aac4a11438916# Parent  a5048a9bc2a81b8d44b0dc73fa97e4ee8a5fea6f
Merge with upstream.

diff -r 5d208c3321ce -r 61abc6f6530c sg101/templates/store/base.html
--- a/sg101/templates/store/base.html	Sun Feb 07 20:43:42 2016 -0600
+++ b/sg101/templates/store/base.html	Sun Feb 07 20:44:03 2016 -0600
@@ -27,6 +27,28 @@
 <em>--Bob Dalley</em>
 <br class="clear">
 </p>
+<hr>
+
+<h4>Southern California Surf Music, 1960-1965</h4>
+<p>
+<img src="https://s3.amazonaws.com/sg101.forum.photos/1J216kvLQpejvHjC3dTG7A.jpg" class="left" alt="Southern California Surf Music">
+"<strong>Southern Californai Surf Music, 1960-1965</strong>, is the new book by John Blair,
+noted surf historian and leader of the surf revival band "Jon &amp; The
+Nightriders."
+</p>
+<p>
+The early 1960s was a great time for kids in Southern California who
+experienced the explosion of surf music beginning with Dick Dale &amp; The
+Del-Tones at the Rendezvous Ballroom. Weekends were for dancing at the
+Rendezvous, Harmony Park, Revelaire Club, or the Retail Clerk's Hall. The
+Belairs, Eddie &amp; The Showmen, The Challengers, Tornadoes, Chantays,
+Surfaris, and hundreds more surf bands plied their trade and created a cultural
+sensation in the process. Here's the story of how that happened. Many seldom
+seen photographs, some never before published
+</p>
+<p>Order now at <a href="http://johnblair.us">John Blair's website</a>.</p>
+<br class="clear">
+<hr>
 
 <h4>Pounding Surf - &ldquo;The Original Full-Length Surf Music Documentary&rdquo;</h4>
 <p>