Groups
Merge branch 'master' of ssh://github.com/Jpuchol/bill_split

Conflicts:
	app/views/groups/index.html.erb
	app/views/groups/show.html.erb
	app/views/shared/_users.html.erb
	db/schema.rb