new changes 1
Merge branch 'master' of github.com:Sergey5131/testreposit

Conflicts:
	testFile.txt