proj
Merge branch 'master' of https://github.com/LeiYang9010/MyApp
files

Conflicts:
	TheMusicCamera/TheMusicCamera.xcodeproj/project.pbxproj