add in groups
Merge branch 'Release2' of https://github.com/COMP231-S63G5/S63G5.git