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
commit before merge
Merge remote-tracking branch 'ecomba/master'

Conflicts:
	Procfile
	lib/mongoid.yml
	views/group_timeline.erb
commiting before merge
Merge remote-tracking branch 'ecomba/master'

Conflicts:
	lib/mongoid.yml
	views/list_of_groups.erb
Merge remote-tracking branch 'ecomba/master'

Conflicts:
	views/group_timeline.erb
comminting prior to merge
removing .DS_Store
merging
Merge pull request #30 from triathlonboy/master

Added JS functionality to the group page
delete group modal box added
committing before pull request
Merge pull request #31 from KeirOsborn/master

Delete post dialog box functionality
erge changes
changed merged