test 7
Merge branch 'master' of https://github.com/gpervukhin/mytest

Conflicts:
	content1/1.txt