Pro fnukyho, nevolam vyrazy, kdyztak, hubli, napis
Merge remote-tracking branch 'origin/master'

Conflicts:
	parser/parsektest.layout