Neco jsem nechtic umazal
Merge branch 'master' of https://github.com/xvlaci/ICP

Conflicts:
	src/bludiste.pro
Merge branch 'master' of https://github.com/xvlaci/ICP