stuff
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/sass/_main.scss
Merge branch 'master' of /Users/Jane/Code/swleipzig/schedule with conflicts.