feature 11
Merge branch 'master' of github.com:tomaskulich/pts_pokus

Conflicts:
	a