done!
Merge branch 'master' of https://github.com/cs6490groupJMR/ProtoSecureChat