added cube to scene
fixed merge conflict
added point light