Jingyi
Merge branch 'master' of https://github.com/holly3600/cis505_group_chat

Conflicts:
	Member.cc
	Member.h