commit
Merge branch 'master' of https://github.com/wesleysui/MarketManager

Conflicts:
	MarketManager.xcodeproj/project.pbxproj

MarketManager.xcodeproj/project.xcworkspace/xcshareddata/MarketManager.x
ccheckout
commit