change local add+commit
Merge branch 'master' of github.com:AlexSazhko/Test1

Conflicts:
	3.txt
adasd