创建了项目的代码，开始代码
Merge branch 'master' of https://github.com/JobsTech/MusicPlayer

Conflicts:
	MusicPlayer/MusicPlayer.xcodeproj/project.xcworkspace/xcuserdata/wangtao.xcuserdatad/UserInterfaceState.xcuserstate
啊啊

啊