oprava 1
conflict resolved
vetev 1 upravena poctvrte
conflict resolved
resolved
Merge branch 'vetev1' of https://github.com/davidgithub1980/test into vetev1
vetev 1 upravena posedme
conflict resolved