Update README.md
Merge branch 'master' of https://github.com/Uko/thesis-template

Conflicts:
	README.md