commit before merge conflicts
Merge branch 'master' into participation_spec
Conflicts from across pairs
fixed participation test to use shouldamatchers
Fixed .rspec
Merge pull request #10 from sjafri5/participation_spec

Participation spec