Group join and leave
Merge branch 'master' of https://github.com/toppy42/partnerproject_site

Incorporating Justin's changes into mine