提交图片
Merge branch 'master' of https://github.com/yeliang001/TheStoreApp

Conflicts:
	TheStoreApp.xcodeproj/project.pbxproj