2
Merge branch 'master' of https://github.com/DimaPateuk/TestGitHub

Conflicts:
	testGit.txt