image editor.h and .m coding complete
Merge branch 'master' of https://github.com/Dominique1023/Instagram

Conflicts:
	Instagram.xcodeproj/project.pbxproj