Maybe this is the final change....

Final changes? hopefully?
Merge branch 'master' of https://github.com/ekemper/thesis

Conflicts:
	tex_files/main.log
	tex_files/main.tex