added reset functionality to Camera
Geodes cannot have shaders and materials enabled at the same time.
Display a cylinder in the scene
Changed wasd movement functionality of camera
Merge branch 'master' into matt

Adding camera changes