user2 commit
Merge branch '1234_short_descr' of https://github.com/slavaz/git-training into 1234_short_descr

Conflicts:
	REDME.txt