pokus
Merge branch 'upiho_pokusy'

Conflicts:
	index.php