Reorganized
Merge branch 'master' of github.com:Blue-Motion/Graphics

Conflicts:
	OpenGL/openglframework.c