File name change.
Merge branch 'master' of https://github.com/jstol/CS3388_Assignment4-raytracer