Made GL2-friendly
Merge remote branch 'origin/glut'

Conflicts:
	bezier-fragshader.c