commit by alex
Merge branch 'master' of github.com:alarv/thesis

Conflicts:
	anna.txt