bug
解决冲突222

Conflicts:
	TheStoreApp.xcodeproj/project.pbxproj

TheStoreApp.xcodeproj/project.xcworkspace/xcshareddata/TheStoreApp.xcche
ckout

TheStoreApp.xcodeproj/project.xcworkspace/xcuserdata/xingyong.xcuserdata
d/UserInterfaceState.xcuserstate