commit

commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	css/header.css
	css/index.css
	scss/base/_colors.scss
	scss/index.scss
	scss/layout/header.scss