From f0ae4295baa1d6573347fe6ffecac68a559f47bf Mon Sep 17 00:00:00 2001
From: Adam Soltys <adam.soltys@pwgsc-tpsgc.gc.ca>
Date: Tue, 27 Nov 2012 21:50:10 -0800
Subject: Content

---
 views/merchants.html | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

(limited to 'views/merchants.html')

diff --git a/views/merchants.html b/views/merchants.html
index a3663c3c..4eff7bc2 100644
--- a/views/merchants.html
+++ b/views/merchants.html
@@ -45,25 +45,23 @@
         <div class="span4">
           <h2>Pacific Bliss Massage</h2>
           <img src="http://pacificblissmassage.com/VancouverCustomizedMassage.jpg" />
-          <p>
-          Vancouver's most blissful massage and integrated healing center. We specialize in Swedish relaxation massage and Hot &amp; Cold Stone Therapy. Treatments can be scheduled at Infinity Salon &amp; Spa &amp; in the summer months at Vancouver's most beautiful location - Wreck Beach!
+          <p style="overflow: hidden">
+          Vancouver's most blissful massage and integrated healing center. We specialize in Swedish relaxation massage and Hot &amp; Cold Stone Therapy. Treatments can be scheduled at Infinity Salon &amp; Spa and in the summer months at Vancouver's most beautiful location - Wreck Beach!
           </p>
         </div>
 
         <div class="span4">
-          <h2>Spartacus Books</h2>
-          <img src="http://www.spartacusbooks.net/new/resources/spartacuslogo.jpg" />
+          <h2>Sweet Tooth Cafe</h2>
+          <img src="http://www.sweettoothcafe.ca/_/rsrc/1301203218770/config/customLogo.gif?revision=8" />
           <p>
-          Everything from cinnamon buns made from grandma’s recipe, famous home style Pad Thai, Homemade soup to Italian specialty coffee drinks, all made right in front of you
+          Everything from cinnamon buns made from grandma’s recipe, famous home style Pad Thai and homemade soup to Italian specialty coffee drinks, all made right in front of you
           </p>
         </div>
 
         <div class="span4">
-          <h2>Sweet Tooth Cafe</h2>
-          <img src="http://www.sweettoothcafe.ca/_/rsrc/1301203218770/config/customLogo.gif?revision=8" />
-          <p>
-          Everything from cinnamon buns made from grandma’s recipe, famous home style Pad Thai, Homemade soup to Italian specialty coffee drinks, all made right in front of you
-          </p>
+          <h2>Divan Kitchen</h2>
+          <img src="http://sphotos-g.ak.fbcdn.net/hphotos-ak-prn1/150071_116421141753535_3214357_n.jpg" />
+          <p>Authentic Turkish kebab and desserts</p>
         </div>
       </div>
       <hr>
-- 
cgit v1.2.3