change
Merge branch 'master' of https://github.com/antonysoldatov/testgit

Conflicts:
	test.txt