text
Merge branch 'master' of https://github.com/karl-potisepp/msc-thesis

Conflicts:
	thesis/thesis.tex