deleted things and added new lights

deleted things and added new lights
new lights

new lights
Merge branch 'master' into John
Merge branch 'John'