added proximity lights
Merge branch 'master' of github.com:rlawther/AmnesiaMuseumUnity

Conflicts:
	Assets/TriggerBehaviour.cs