stupid diag
Merge branch 'master' of https://github.com/bibs15109/Practicum

Conflicts:
	CS4620/GLDiag.txt