master commit
re
Merge branch 'cs-000'

Conflicts:
	cs-000.txt
	newfile-cs-000.txt
esr
Merge branch 'master' of https://github.com/mikhaylenko/my