Azard修改测试2
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/team/dingding/musicgloves/MainActivity.java