S
Merge branch 'master' of https://github.com/kabk/MaxLennarts

Conflicts:
	Thesis.html