Git auto-merge. Shaders can be bound to individual nodes, camera checks out
Merging project tree changes and Window cleanup into master
Merging project tree changes and Window cleanup into master
Forgot to move some other shaders into the proper folder
Added Material class.  Can set the shininess, ambient, diffuse, and specular values of an object's material as well as the color.  Use apply method before drawing the material
Added Material member variables to the Geode class
Fixed mistake with Material.cpp where there was a duplicate method
fixed apple/windows glut includes
Added all the #include "glee.h" before GL/glut.h
added reset functionality to Camera
Geodes cannot have shaders and materials enabled at the same time.
Changed wasd movement functionality of camera
changed sky box
flipped right/left textures
last skybox texture change
Merged. Added fullscreen. Press ESC to close. Terrain looks okay if we nonuniformly scale it.