chybicka
Merge branch 'master' of https://github.com/Tomas-Zelinka/thesis

Conflicts:
	projekt.pdf