Changed name of Player_Game table to Participations, satisfied all previous model tests for Player_games under Participations
merge conflicts fixed
Merge pull request #7 from sjafri5/player_game_spec

Player game spec
fixed participation table
fixed merge conflict;
Merge pull request #8 from sjafri5/parth_raza_relationships

Parth raza relationships
commit before merge conflicts
Merge branch 'master' into participation_spec
Conflicts from across pairs
Resolving conflicts
Merge pull request #9 from sjafri5/adding-ass-tests

Resolving conflicts
fixed participation test to use shouldamatchers
Fixed .rspec
Merge pull request #10 from sjafri5/participation_spec

Participation spec
merge