dsdfsgsgdsfgdggdfggd
komenkomentt

Merge branch 'master' of https://github.com/tumpji/IFJ-projekt-

Conflicts:
	pokus