commit from 1
Merge branch 'master' of https://github.com/vkappie/testgit

Conflicts:
	src/1.txt