dealing with merge stuff
adds new acceptance tests
Merge pull request #13 from gunadic/participation_spec

Participation spec