Changed it again
changed
Changed text2
Merge branch 'master' of https://github.com/ilyabakharev/Test

Conflicts:
	text3.txt