modify music
fix conflict
Merge branch 'master' of https://github.com/liangxiaofei1100/Gesture