Made some of the changes that Geoff wanted, please read through them
Merge branch 'master' of https://github.com/hans513/Thesis