Initial commit
Merge branch 'master' of https://github.com/hickmd/UoN-CS4HS-2014