added spot light to scene
fixed merge conflict