improved sidebar
Merge branch 'master' into homepage_layout
added colors and homepage layout
added bootstrap defaults to app to overwrite it
fixed the homepage layout
improved boxes and removed old code
fixed broken .ruby-version
fixed broken ruby-version again :D
removed unused bootstrap code, there is an issues now to improve that
improved header to try (!) to fit layout
fixed body padding
bumped ruby version
Merge branch 'master' into home-new

Conflicts:
	app/assets/stylesheets/application.css.scss
	app/views/pages/home.html.erb
updated gemfile
upgraded to ruby 2.0
Merge pull request #72 from koelncampus/home-new

Home new