moje dalsi zmena
Merge branch 'master' of https://github.com/timmy83/pokus1

Conflicts:
	pokus.txt