loading stuff
bleh
Merge branch 'ben' into engine_work
Scene shader written.  Needs commenting.
Updated new shader class, added material class and general work.
I think we can almost draw.  Haven't compiled/debugged though.  We'll see.