finished bump mapping
Merge branch 'master' of https://github.com/aashish-sheshadri/cs384G-ray