Updated shaders
Merged changes
Added spotlight, working on flashlight