updated vertex shader

vertshader works with Daren’s updated fragshader
cleaning up code
near final update
Merge branch 'marie---shader-testing-branch'

Conflicts:

XCode_projects/cs450_a5/cs450_a5.xcodeproj/project.xcworkspace/xcuserdat
a/daren.xcuserdatad/UserInterfaceState.xcuserstate
	assignment5/src/prog
	assignment5/src/vshader.glsl