style changes
Merge branch 'master' of https://github.com/christianbueschi/nzz

Conflicts:
	stylesheets/app.css
b
Merge branch 'master' of https://github.com/christianbueschi/nzz