html stuff
Merge branch 'master' of https://github.com/juliahuang/GroupShare

Conflicts:
	app/views/groups/index.html.erb
	app/views/groups/new.html.erb