nothing much changed
Merge branch 'master' of https://github.com/ishaan13/PhotonMapper

Conflicts:
	PROJ1_WIN/src/raytraceKernel.cu.deps
starting kdtree traversal
resolving conflict