From efe08b28b627fd8d9badfbf3a3e5e55ab2681052 Mon Sep 17 00:00:00 2001
From: Jack Morgan <jackmorgannz@gmail.com>
Date: Thu, 16 Jul 2015 14:41:01 +1200
Subject: [PATCH 1/4] Added note about only attending programming workshops

---
 register.html | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/register.html b/register.html
index 7e26df5..d0f2360 100644
--- a/register.html
+++ b/register.html
@@ -38,6 +38,10 @@ <h5>Mon 30th Nov 11:00am – Tue 1st Dec 5:00pm</h5>
     <p>Optional programming workshops on Mon - Tues (30 Nov - 1 Dec) before the main conference. Food is not provided on Monday/Tuesday as part of this package.</p>
   </div>
 
+  <p>
+    You are welcome to attend a programming workshop and not the main conference, however we cannot provide you a transport subsidy as Google only funds CS4HS attendees.
+  </p>
+
   <h4>Payment</h4>
 
   <p>

From a3df1acfad148042146badb0c5edbe0d63aee0f2 Mon Sep 17 00:00:00 2001
From: Jack Morgan <jackmorgannz@gmail.com>
Date: Thu, 16 Jul 2015 14:41:25 +1200
Subject: [PATCH 2/4] Simplified conference bullet point list

---
 index.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/index.html b/index.html
index 5e15f04..c4be68f 100644
--- a/index.html
+++ b/index.html
@@ -11,8 +11,8 @@ <h2>Welcome!</h2>
     <p>The conference aims to cover:</p>
 
     <ul class="disc">
-        <li>Computer Science NCEA Standards (both introductions and analysis)</li>
-        <li>Programming NCEA Standards (both introductions and analysis)</li>
+        <li>Computer Science NCEA Standards</li>
+        <li>Programming NCEA Standards</li>
         <li>Student stories and industry visit</li>
         <li>Networking opportunities with other NZ educators</li>
         <li>How Computer Science can work at Years 9 &amp; 10</li>
@@ -48,7 +48,7 @@ <h2>Updates</h2>
      href="https://twitter.com/UCCSEd"
      data-widget-id="525448302553083904"
      data-chrome="noheader nofooter noscrollbar transparent"
-     height="900">
+     height="1200">
   </a>
   </div>
 </div>

From a9e165e6282c8ecfd45121e95e73d16f7f6d4523 Mon Sep 17 00:00:00 2001
From: Jack Morgan <jackmorgannz@gmail.com>
Date: Thu, 16 Jul 2015 14:41:53 +1200
Subject: [PATCH 3/4] Added links to authors and open source repo

---
 templates/footer.html | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/templates/footer.html b/templates/footer.html
index 7966d4c..1571d12 100644
--- a/templates/footer.html
+++ b/templates/footer.html
@@ -10,7 +10,10 @@
           <a href="http://nzacditt.org.nz/"><img src="./img/nzacditt-logo.png" class="logo"></img></a>
       </p>
       <p>
-          2015 - Jack Morgan &amp; Jordan Griffiths
+        <a href="https://github.com/uccser/cs4hs">This website is open source and available on GitHub</a>
+      </p>
+      <p>
+          2015 - <a href="https://twitter.com/jackmorgannz">Jack Morgan</a> &amp; <a href="https://twitter.com/jgriffs_nz">Jordan Griffiths</a>
       </p>
     </div>
   </div>

From 5c85cfea0b0595e47c897d41a79d873c3d104574 Mon Sep 17 00:00:00 2001
From: Jack Morgan <jackmorgannz@gmail.com>
Date: Thu, 16 Jul 2015 14:42:28 +1200
Subject: [PATCH 4/4] Updated version number to 2015.3

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 32dfff8..ba8ceec 100644
--- a/README.md
+++ b/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.2 (CS4HS 2015 pre-conference)
+**Current Version:** 2015.3 (CS4HS 2015 pre-conference)
 
 ## Overview