add UIColor Category
folder
Merge branch 'master' of https://github.com/HapBoy10/WYCategory

Conflicts:
	WYCategory.xcodeproj/project.pbxproj