making lamp appear
made light follow lamp
Merge branch 'master' of https://github.com/walterm/lamp
added background music and fixed merge conflicts