t1 iz test2
Merge branch 'master' of https://github.com/elizabeta/Hello-World

Conflicts:
	t1.txt