Adding messaging updates
Merge branch 'master' of https://github.com/cs275/Groupit