Merge branch 'master' of https://github.com/Pavhan/pokus1 into neco

Conflicts:
	print.css