adding a bunch of stuff for final obj files
merge conflics in ExampleScene.cpp