2
Merge branch 'master' of github.com:signintech/testgit

Conflicts:
	test1.txt
3