a
Merge branch 'master' of https://github.com/clucasa/Olympus
Scene loader, turned back on motion blur
I think I merged chris' stuff. DoF doesn't jam with resize, lots of lighting problems. I tried merging Michaels stuff but all the models came out black, and the shadow I guess never was being drawn to.