Fixed compile errors
Merge branch 'master' of https://github.com/UMN-CSCI-5115/MGroups