Broken texture mapping
Merge branch 'master' of https://github.com/rohith10/Project2-Pathtracer into develop

Conflicts:
	PROJ1_WIN/565Pathtracer/test.0.png
	src/raytraceKernel.cu
	src/scene.cpp