test23_2
Merge branch 'master' of https://github.com/gpervukhin/mytest.git

Conflicts:
	content1/1.txt