кнопки правки
Merge branch 'master' of https://github.com/SergeyShamrikov/Rudn

Conflicts:
	css/sergey.css
	css/style.css
	css/sveta.css