nothing change

如题
Merge branch 'master' of https://github.com/Kelvin-Hu/ImageUsingOpenGLDemo

Conflicts:
	ImageUsingOpenGLDemo/KHMainViewController.m
	ImageUsingOpenGLDemo/KHOpenGLView.m