lighter background color
Merge branch 'master' of github.com:tonisuter/merkli-lichtblick.ch

Conflicts:
	merkli-lichtblick/stylesheets/css/main.css
	merkli-lichtblick/stylesheets/sass/main.scss