添加解析socket帧
Merge remote-tracking branch 'origin/master'

Conflicts:
	client.html
	socket.js
实现聊天室