aaa
Merge branch 'master' of https://github.com/LeiYang9010/TheMusicCamera

Conflicts:
	TheMusicCamera.xcodeproj/project.pbxproj
	TheMusicCamera/TheMusicCamera-Info.plist