delete conflict files
Merge branch 'master' of https://github.com/wsds/chitchat
增加语音测试应用