merge 11/6
merge 11/6
Merge branch 'master' of github.com:AustinJiang/MyXiaoApp
almost finish chat