From: Ian Weller <ian@gaslightmedia.com>
Date: Mon, 22 Feb 2016 17:05:34 +0000 (-0500)
Subject: Merge branch 'hotfix/1.1.11' into develop
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=4b3caa974512a163551a2a8ba590a7ce2faddfdf;p=web%2FBigFore.git

Merge branch 'hotfix/1.1.11' into develop

Conflicts:
	templates/template.html
---

4b3caa974512a163551a2a8ba590a7ce2faddfdf
diff --cc templates/template.html
index 0069769,24e809c..b453664
mode 100644,100755..100755
--- a/templates/template.html
+++ b/templates/template.html
@@@ -79,11 -79,11 +79,13 @@@
                      <ul>
                          <li>
                              <i>May Special&#42;&#42;</i>
-                             <b>$371 per golfer</b>
++
+                             <b>$300 per golfer</b>
                          </li>
                          <li>
-                             <i>Summer</i>
-                             <b>$574 per golfer</b>
+                             <i>Summer&#42;&#42;&#42;</i>
+                             <b>$471 per golfer</b>
++
                          </li>
                          <li>
                              <i>Early Fall</i>
@@@ -91,18 -91,18 +93,20 @@@
                          </li>
                          <li>
                              <i>Late Fall</i>
-                             <b>$431 per golfer</b>
++
+                             <b>$317 per golfer</b>
                          </li>
                      </ul>
-                     <p>All taxes and fees included</p>
+                     <p><b>All taxes and fees included</b></p>
                  </div>
-                 <div id="pricing2">
-                     <h3>Two Day Weekend&#42;</h3>
-                     <p>2 nights lodging &sim; 4 rounds of golf</p>
+                 <div id="pricing4">
+                     <h3>Three Day Weekend&#42;</h3>
+                     <p>3 nights lodging &sim; 4 rounds of golf<br>(Friday, Saturday and Thurs or Sun)</p>
                      <ul>
                          <li>
                              <i>May Special&#42;&#42;</i>
-                             <b>$338 per golfer</b>
++
+                             <b>$335 per golfer</b>
                          </li>
                          <li>
                              <i>Summer&#42;&#42;&#42;</i>