icon
Merge branch 'master' of https://github.com/callzhang/PennyCamera

Conflicts:
	PennyCemera.xcodeproj/project.pbxproj

SimplePhotoFilter.xcworkspace/xcuserdata/Lee.xcuserdatad/UserInterfaceSt
ate.xcuserstate