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

Conflicts:
	TheMusicCamera/Base.lproj/Main.storyboard
	TheMusicCamera/TheMusicCamera-Info.plist
	TheMusicCamera/zh-Hans.lproj/Main.storyboard