devel
komit
Merge branch 'devel' of https://github.com/jvaclavovic/test into devel

Conflicts:
	src/zdrojak.sql
testovaci komit behem skoleni
Merge branch 'devel'

Conflicts:
	src/zdrojak.sql

dfhdsfkhk