new position
c
Merge branch 'master' of https://github.com/HentreGeneral/iOSChatRoomClientDemo

Conflicts:
	.gitignore
	iOSChatRoomClientDemo.xcodeproj/project.pbxproj

iOSChatRoomClientDemo.xcodeproj/project.xcworkspace/xcshareddata/iOSChat
RoomClientDemo.xccheckout

iOSChatRoomClientDemo.xcodeproj/project.xcworkspace/xcuserdata/hadoop.xc
userdatad/UserInterfaceState.xcuserstate