first blood
Merge branch 'master' of github.com:LingyuCoder/HiChat2