3 commit
Merge branch 'master' of https://github.com/YuryLubchenko/TestRepo

Conflicts:
	1.txt