todiscard
Merge branch 'master' of https://github.com/Xander89/master_thesis

Conflicts:
	documents/thesis.aux
	documents/thesis.log
	documents/thesis.out
	documents/thesis.pdf
	documents/thesis.toc