Fixes,fixes everywhere,home_cont_spec
Fixes,fixes everywhere,home_cont_spec
 eee
conflicts
fixes,home controller
GroupContSpec
GroupContSpec,fixes
Merge branch 'master' of https://github.com/krochmal/memegen

Conflicts:
	app/assets/stylesheets/style.css.scss
	app/views/groups/new.html.haml