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
testing commit commands
another test commit
Random Comment
Merge remote-tracking branch 'vince/post-message' into post-message

Conflicts:
	lib/collaborator.rb
lunch time updates
Reset this shizzle
Added a real post to MongoDB via Cuke Tests using Rspec
Create README.md
Thursday morning refresh - it works on Cucke
dfjhskjdfh
ated upstream into a topic branch.
Ready for a pull request
Group timeline draft1
added css and layout.rb