pravim frku
RESOLVED
Merge branch 'master' of https://github.com/elizabeta/Hello-World

Conflicts:
	bla.bla.txt