commit resolved 2nd conflict
Merge branch 'master' of ssh://github.com/pavelfomin/testrepo

Conflicts:
	test1.txt