1
Merge branch 'master' of github.com:kirilovskikh/test

Conflicts:
	text.txt