a
Merge branch 'master' of https://github.com/TeamCHC/ios

Conflicts:
	CoreImageApp/CoreImageApp.xcodeproj/project.pbxproj
	CoreImageApp/CoreImageApp/ViewController.m