commiting before merging ecomba
Merge remote-tracking branch 'ecomba/master'

Conflicts:
	lib/collaborator.rb
heroku commit
commiting heroku setup
commit before pushing to heroku
:commit before deploy to Heroku
Created relationship with user and groups
commit before merge
Hello
Merge remote-tracking branch 'ecomba/master'

Conflicts:
	Procfile
	lib/mongoid.yml
	views/group_timeline.erb
Merge remote-tracking branch 'Enrique/master'
Half way through hacking the like button
Tidying up the HTML semantics
commiting before merge
Merge remote-tracking branch 'ecomba/master'

Conflicts:
	lib/mongoid.yml
	views/list_of_groups.erb
Added jQuery file
Merged from ecomba Fetch
Merge remote-tracking branch 'ecomba/master'

Conflicts:
	views/group_timeline.erb
Added some JS buttons to list_of_groups
Added LIKE button etc