Latest set-up for grouptimline
Latest Changes
commiting before merging with matt/master
Help me!
Merge remote-tracking branch 'matt/master'

Conflicts:
	Gemfile
	Gemfile.lock
	lib/collaborator.rb
Merged Matt's changes to have mongoid working
MOAR changes
Group timeline draft1
closes #4 -> Group timeline