img
Merge branch 'master' of https://github.com/zhaozzq/ImageFilter

Conflicts:
	ImageFilter.xcodeproj/project.pbxproj
	ImageFilter/9.jpg