проект для Оли
Merge branch 'master' of https://github.com/kotAndy/kotandy.github.io

Conflicts:
	css/style.css