Merge pull request #102 from jun-lu/master

get update
edit some thing
Merge pull request #103 from jun-lu/master

add
Merge branch 'master' of https://github.com/CKHuang/webchat
Merge pull request #119 from CKHuang/master

Merge pull request #102 from jun-lu/master