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

Parth raza relationships