Fixes #9, Fixes #8
Merge branch 'master' of github.com:Melindrea/mariehogebrandt-se

Conflicts:
	app/styles/_typography.scss