New commit
Merge branch 'master' of github.com:askrinnik/MyRepo1

Conflicts:
	1.txt