Various changes made by Odricku.
rge branch 'master' of https://github.com/BoZenKhaa/audrey_thesis

Conflicts:
	AJ_thesis_maindocument.tex
	chapter3file.tex
merged files that jan and i worked on separatel