style stuff
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/config.json
	public/sass/_categorize.scss
Merge branch 'master' of github.com:swleipzig/schedule
Merge branch 'master' of github.com:swleipzig/schedule

Conflicts:
	public/config.json
	public/sass/_categorize.scss
Merge branch 'master' of github.com:swleipzig/schedule