many update
1
2
c
Merge branch 'master' of https://github.com/HentreGeneral/iOSChatRoomClientDemo

Conflicts:
	.gitignore