sass simon fic
Merge branch 'master' of https://github.com/funtrix/exjobb

Conflicts:
	scss/app.scss