changed a little of the shader stuff ready for explicit textures, also building groundwork for level construction
fixed merge conflicts in the Level.hpp, my bad...