gettin rid of the red
Ignore the GLDiag.txt
Trying again
This version works
blah
Fix bug
Merge branch 'shaders' of https://github.com/avh34/CS-4620 into shaders

Conflicts:
	CS4620/GLDiag.txt
cooktorrance yo
environment mapping motherfucker
i dont know man
just commitin shit
fix andres computer
fixed andres computer
dispo
all done
comments and stuff
all fixed
done done
Merge with shaders and stuff