撒上
Merge branch 'master' of https://github.com/ccguo/CategoryClass

Conflicts:
	CategoryClass.xcodeproj/project.xcworkspace/xcshareddata/CategoryClass.xccheckout
	CategoryClass.xcodeproj/project.xcworkspace/xcuserdata/admin.xcuserdatad/UserInterfaceState.xcuserstate
	CategoryClass/MainViewController.h