first commit, deferred shading buggy on floating textures
resolve conflict