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

Conflicts:
	FRONTEND/concreteNew.html
	FRONTEND/css/main.css
123
Merge branch 'master' of https://github.com/OlgaBielkina/gruzovoy

Conflicts:
	FRONTEND/scss/skin.scss