Fixed the light localization.

It should work all the time now.
Commit before light loc. test 1
Fixed small error in getting the correction,
Fixed light localization again

Not tested.
I wrote || instead of && at some place.
Bug fix in light loc.

...Never seem to get the if/else statements right.
Merge branch 'master' of https://github.com/mattgray7/DPMFinal into light-loc-test