working local lighting model in Ray.cpp
fixed merge conflict