myFile new ver 3 appeared
Merge branch 'master' of https://github.com/kitjarik/MarinaTest

Conflicts:
	myFile.txt