written the first class, whihc passes the first cucumber test. Still to pass the second test.
committing my changes before merging nicky's work which has matt's post.rb file, which I didn't have
committing my files after conflicts resolved once I merged with nicky's list-of-groups branch
my stuff after Enrique added the html stuff to Nicky and I had to save my files before merging hers
Thu aft
merged with ecomba
Friday post cleanup
commiting before merge 16.17 10.05.13
commiting before merge 16.23 10.05.13
Merge remote-tracking branch 'ecomba/master'

Conflicts:
	lib/collaborator.rb
Friday night post merge final commit
allow people to post to a specific group
draft for Vincent
changes for Vincent
Merge remote-tracking branch 'ecomba/master'
Merge pull request #13 from hoongman/master

can now post messages to a group
take my changes
Merge remote-tracking branch 'keir/master'

Conflicts:
	lib/collaborator.rb
	lib/group.rb
	views/style.erb
	views/style.erb.css
Login page completed
added ability to post message to a group timeline
resolving conflicts with login function
Merge remote-tracking branch 'steve/master' into HEAD

Conflicts:
	features/.DS_Store
	features/list_of_groups.feature
	features/step_definitions/list_of_groups.rb
	lib/collaborator.rb
	lib/group.rb
	spec/collaborator_spec.rb