took out edge shading in gooch and hatching
Merge branch '4621' of https://github.com/avh34/CS-4621 into 4621

Conflicts:
	CS4620/data/scenes/shader-assignment/TestScene.xml
Merge branch '4621' of https://github.com/avh34/CS-4621 into 4621

Conflicts:
	CS4620/GLDiag.txt
Merge branch '4621' of https://github.com/avh34/CS-4621 into 4621

Conflicts:
	CS4620/src/cs4620/gl/shaders/Gooch.frag
added new testscene
Merge branch '4621' of https://github.com/avh34/CS-4621 into 4621

Conflicts:
	CS4620/GLDiag.txt
	CS4620/data/scenes/shader-assignment/TestScene.xml