qwerty
t Please enter the commit message for your changes. Lines starting
Merge branch 'master' of https://github.com/khayrutdinov/jug-git-demo

Conflicts:
	test.txt