6
Merge branch 'master' of https://github.com/askrinnik/TestRepo

Conflicts:
	1.txt