Fix bug
Merge branch 'shaders' of https://github.com/avh34/CS-4620 into shaders

Conflicts:
	CS4620/GLDiag.txt