druhy
new
uprava
Merge branch 'hokus'

Conflicts:
	a.txt
aaa
Merge branch 'hokus' of https://github.com/baxx007/try_git