Merge. Now valid code.
Merge branch 'master' of https://github.com/ChewieSC/swp13-sc