Merge pull request #17 from CKHuang/master

	 修改房间名称判断
10号接口修改
Merge pull request #18 from CKHuang/master

	 添加时间
Merge pull request #19 from CKHuang/master

	 测试如何解决冲突
Merge pull request #20 from CKHuang/master

	 解决冲突使用
test
test
Merge pull request #21 from CKHuang/master

	 修改一下
Merge pull request #22 from CKHuang/master

修改Bugs
时间tag
socket连接的bug,HTML的部分修改
css 修改，添加more loading状态
css  add
add 忽略
Merge pull request #18 from jun-lu/master

获取更新