Marek 2 - nova zprava
Merge branch 'master' of github.com:Stalky90/repositar

Conflicts:
	soubor1.txt
	soubor3.txt