Work
Merge branch 'master' of https://github.com/circlingthesun/Masters

Conflicts:
	docs/Thesis/thesis.sublime-project
	docs/Thesis/thesis.sublime-workspace