From 91d2cf854f32acfb6fe434cf4a68ba6e6c04c1b2 Mon Sep 17 00:00:00 2001
From: Adam Soltys <adam.soltys@pwgsc-tpsgc.gc.ca>
Date: Sun, 31 Mar 2013 10:34:06 -0700
Subject: Fix QR code and websocket issues

---
 views/main/merchants.html | 29 +++++++++++++----------------
 1 file changed, 13 insertions(+), 16 deletions(-)

(limited to 'views')

diff --git a/views/main/merchants.html b/views/main/merchants.html
index fa30a44d..db5816cb 100644
--- a/views/main/merchants.html
+++ b/views/main/merchants.html
@@ -18,12 +18,12 @@
       </div>
 
       <div class="directory">
-        <h2><a href="http://www.artofmuse.com/">Art of Muse</a></h2>
-        <a href="http://www.artofmuse.com/"><img src="/img/artofmuse.png" alt="Art of Muse" /></a>
-        <p style="clear: both; overflow: hidden">
-        Music lessons for youth &amp; adults.  Learn how to play Piano or Keyboard from basic to intermediate levels. Whether you are interested in playing classical pieces or making pop, rock or electronic music, we will give you the skills and knowledge.
+        <h2><a href="http://pacificblissmassage.com/">Pacific Bliss Massage</a></h2>
+        <a href="http://pacificblissmassage.com/"><img src="/img/pacificbliss.jpg" alt="Pacific Bliss" /></a>
+        <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>
       
       <div class="directory">
         <h2><a href="http://nolimitlandscapes.com/">No Limit Landscaping</a></h2>
@@ -31,14 +31,6 @@
         <p style="clear: both; overflow: hidden">No Limit Landscaping is a new company formed in January of 2013. With over 20 years of experience in the industry, we will be focusing our expertise on the residential sector. We install full landscapes from start to finish. From designing to excavation to a completed landscape we will work with you through the entire process. Our water features set us apart from our competitors and are an excellent addition to any household.</p>
       </div>
 
-      <div class="directory">
-        <h2><a href="http://pacificblissmassage.com/">Pacific Bliss Massage</a></h2>
-        <a href="http://pacificblissmassage.com/"><img src="/img/pacificbliss.jpg" alt="Pacific Bliss" /></a>
-        <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="directory">
         <h2><a href="http://yourlocalmoversbc.com/">Your Local Movers</a></h2>
         <a href="http://yourlocalmoversbc.com/"><img src="/img/yourlocalmovers.png" alt="Your Local Movers" /></a>
@@ -49,6 +41,14 @@ Your Local Movers provides service to the entire Lower Mainland as well as the S
         </p>
       </div>
 
+      <div class="directory">
+        <h2><a href="http://www.artofmuse.com/">Art of Muse</a></h2>
+        <a href="http://www.artofmuse.com/"><img src="/img/artofmuse.png" alt="Art of Muse" /></a>
+        <p style="clear: both; overflow: hidden">
+        Music lessons for youth &amp; adults.  Learn how to play Piano or Keyboard from basic to intermediate levels. Whether you are interested in playing classical pieces or making pop, rock or electronic music, we will give you the skills and knowledge.
+        </p>
+      </div> 
+
       <div class="directory">
         <h2><a href="http://www.cabin12.ca/">Cabin 12 Restaurant</a></h2>
         <a href="http://www.cabin12.ca/"><img src="/img/cabin12.jpg" alt="Cabin 12 Restaurant" /></a>
@@ -68,9 +68,6 @@ Your Local Movers provides service to the entire Lower Mainland as well as the S
         Cash, debit, Visa or MasterCard, Canadian Tire Money and Bitcoins accepted.
         </p>
       </div>
-
-
-
     </div>
   </div>
 </div>
-- 
cgit v1.2.3