Styleguide
Merge branch 'master' of https://github.com/lgaechter/sbb

Conflicts:
	css/style.css
	scss/_variables.scss
scss variables