xxxxx
Merge branch 'master' of https://github.com/StillModern/ShoppingApp

Conflicts:
	ShoppingApp.xcodeproj/project.pbxproj

ShoppingApp.xcodeproj/project.xcworkspace/xcuserdata/ty.xcuserdatad/User
InterfaceState.xcuserstate

ShoppingApp.xcodeproj/xcuserdata/ty.xcuserdatad/xcdebugger/Breakpoints.x
cbkptlist
	ShoppingApp/GoodsViewController.h
	ShoppingApp/GoodsViewController.m
	ShoppingApp/GoodsViewController.xib
	ShoppingApp/MineViewController.m
	ShoppingApp/NetConnect.m
	ShoppingApp/ShoppingApp-Prefix.pch
	ShoppingApp/ShoppingCarViewController.m