commit
Merge branch 'master' of https://github.com/OlgaBielkina/gruzovoy

Conflicts:
	FRONTEND/css/main.css
marks final