From c48ae4a34757ab7c5cd53ee98c739feec5e44471 Mon Sep 17 00:00:00 2001
From: Adam Soltys <adam.soltys@pwgsc-tpsgc.gc.ca>
Date: Tue, 8 Jan 2013 14:02:15 -0800
Subject: Update merchants page

---
 public/img/adelines.jpg        | Bin 0 -> 7735 bytes
 public/img/pacificbliss.jpg    | Bin 0 -> 49321 bytes
 public/img/yourlocalmovers.png | Bin 0 -> 16943 bytes
 views/main/merchants.html      |  26 ++++++++++++++++++++++----
 4 files changed, 22 insertions(+), 4 deletions(-)
 create mode 100644 public/img/adelines.jpg
 create mode 100644 public/img/pacificbliss.jpg
 create mode 100644 public/img/yourlocalmovers.png

diff --git a/public/img/adelines.jpg b/public/img/adelines.jpg
new file mode 100644
index 00000000..0777396d
Binary files /dev/null and b/public/img/adelines.jpg differ
diff --git a/public/img/pacificbliss.jpg b/public/img/pacificbliss.jpg
new file mode 100644
index 00000000..a8ff4678
Binary files /dev/null and b/public/img/pacificbliss.jpg differ
diff --git a/public/img/yourlocalmovers.png b/public/img/yourlocalmovers.png
new file mode 100644
index 00000000..e48b477f
Binary files /dev/null and b/public/img/yourlocalmovers.png differ
diff --git a/views/main/merchants.html b/views/main/merchants.html
index 17ab6976..10b800ec 100644
--- a/views/main/merchants.html
+++ b/views/main/merchants.html
@@ -9,9 +9,21 @@
 
   <div class="row-fluid">
     <div class="span12">
+      <div class="directory">
+        <h2><a href="http://www.facebook.com/AdelinesCafe">Adeline's</a></h2>
+        <a href="http://www.facebook.com/AdelinesCafe"><img src="/img/adelines.jpg" alt="Adeline's" /></a>
+        <p style="overflow: hidden">Fresh &amp; Delicious Gourmet Sandwiches, Salads, Soups and Baking</p>
+      </div>
+
+      <div class="directory">
+        <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 class="directory">
         <h2><a href="http://pacificblissmassage.com/">Pacific Bliss Massage</a></h2>
-        <a href="http://pacificblissmassage.com/"><img src="http://pacificblissmassage.com/VancouverCustomizedMassage.jpg" alt="Pacific Bliss" /></a>
+        <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>
@@ -25,10 +37,16 @@
         </p>
       </div>
 
+      
+
       <div class="directory">
-        <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>
+        <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>
+        <p>
+        We can do anything from moves, deliveries, junk removal or even help moving something around the inside of your house!  No job is too big or small for us.
+
+Your Local Movers provides service to the entire Lower Mainland as well as the Sunshine Coast, Whistler, and Vancouver BC.
+        </p>
       </div>
     </div>
   </div>
-- 
cgit v1.2.3