Zmena v master vetvi pro druhy pokus
Merge commit '9603fe6c66ae7f8ca66908aeb15012909a3c1481'

Conflicts:
	druhy pokus.txt