Phong shading and spotlighting now completely implemented, working on atenuation, and textures and then I'm done
fixed merge confilce with shader