конфликт
Merge branch 'master' of https://github.com/slavalsHome/homo1

Conflicts:
	README.md