Added directional and point lights
fixed merge conflicts