Priklad 4
Merge branch 'master' of https://github.com/jsenko/IV003
merge
Conflicts:
	hw-1/hw-1-text-senko-uhercik/IV003-hw-1-text-senko-uhercik.pdf