wat
Merge branch 'master' of https://github.com/FortOyer/Dissertation

Conflicts:
	main/main.aux
	main/main.pdf
	main/main.synctex.gz