css update
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/css/style.css
	src/index.html
	src/layout/css/layout.css
	src/layout/img/logo.svg
	src/layout/img/logo_try1.svg