tomasa
Merge branch 'master' of github.com:dormon/jakokdybyholub

Conflicts:
	makefilee