разветвление2
Merge branch 'master' into slave1

Conflicts:
	README.md