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
Friday night post merge final commit
changes for Vincent
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
cleaned up conflicts with login function, 2nd try...
cleaned up rspec and cucumber tests
"merging in group changes from Matt"
Merge remote-tracking branch 'matt/master' into HEAD
"deleted unused test"