Fuckloads of changes. Brought it up to hand in-able state, excluding Matthew's latest push.
Merge branch 'master' of https://github.com/MatthewWood/ClientGroup22.git