styling stuff
Merge branch 'master' of https://github.com/afkatja/QlockWise

Conflicts:
	css/style.css
	scss/layout/_header.scss
	scss/no-modular/_home.scss