stuff
Merge branch 'master' of https://github.com/lougrims/thesis
Merge branch 'master' of http://www.github.com/lougrims/thesis
pdf updated