ggk
Merge branch 'master' of https://github.com/Ivanov-Alexander/test.git

Conflicts:
	git/1.txt