Intermediary Checkin.

Beginning to add support for multi-shader to Objects with Uniform properties.
Principally, this affects the camera!
Merge branch 'master' of https://github.com/UMLComputerGraphics/GraphicsProject
Merging Zach's Demo