update
Merge branch 'master' of https://github.com/joybell/group_chat

Conflicts:
	README.md
update