mit farben# Please enter the commit message for your changes. Lines starting
Merge branch 'master' into colors

Conflicts:
	Gemfile.lock
Merge pull request #77 from koelncampus/colors

Colors
Merge branch 'master' into home-new

Conflicts:
	app/assets/stylesheets/application.css.scss
	app/views/pages/home.html.erb