Merge branch 'hotfix-2015.4'

README.md

@@ -2,7 +2,7 @@
 
 This project generates the website for the CS4HS Conference held at the University of Canterbury, New Zealand located at [cosc.canterbury.ac.nz/cs4hs](http://www.cosc.canterbury.ac.nz/cs4hs/index.html).
 
-**Current Version:** 2015.3 (CS4HS 2015 pre-conference)
+**Current Version:** 2015.4 (CS4HS 2015 pre-conference)
 
 ## Overview
 

register.html

@@ -48,6 +48,21 @@ <h4>Payment</h4>
     For those paying to attend programming workshops, our registration process accepts payment by credit card or we can invoice you the amount. Note that there is no refund and/or subsidy if you are unable to attend and do not inform us. If you do let us know about cancelling before the event, we will refund your ticket where possible (however admin fees still apply). See the Terms and Conditions on the registration site for more details.
   </p>
 
+  <h2 id="subsidy">Subsidy Levels</h2>
+
+  <p>Our sponsors provide enough money to provide travel and accommodation subsidies to those travelling long distances. In our registration form, you can choose one of the following subsidy levels:</p>
+
+  <ul>
+    <li>I live near (less than 50km) Christchurch, so am not eligible for any subsidy or accommodation.</li>
+    <li>I live within driving/bus distance (about 50 to 200km) from Christchurch, so would like to apply for accommodation.</li>
+    <li>I would fly to the event from a main airport (Auckland, Wellington, Dunedin) and would like to apply for a $150 travel subsidy and accommodation subsidy.</li>
+    <li>I live more than 60 minutes from a major airport and/or plan to drive a larger distance, and would like to apply for a larger travel subsidy and accommodation. The amount subsidised is provided on a case by case basis.</li>
+    <li>I wish to attend a programming workshop but not the main conference so I am not eligible for a transport subsidy. Accommodation for programming workshops is part of the ticket cost.</li>
+    <li>I am a workshop leader so I am not eligible for a transport subsidy.</li>
+  </ul>
+
+  <p>For those who are applicable for an accommodation subsidy, the full cost is covered (including breakfast).</p>
+
   <h3 id="waitlist">Expression of Interest Waitlist</h3>
 
   <p>