Dodana 4 linia
Merge branch 'master' of git@github.com:smogord/learngit.git

Conflicts:
	testtext.txt