lesson5

completed
Merge branch 'refs/heads/temp'

Conflicts:
	cube.xcodeproj/project.pbxproj
	cube.xcodeproj/xcuserdata/tzvifi.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist
	cube/GLView.mm
	cube/SimpleFragment.glsl