Fixes some with scss-files
Merge branch 'master' of https://github.com/SwedishFika/sassy-fika

Conflicts:
	assets/scss/_globals.scss