add uniformgrid
Merge branch 'master' of https://github.com/baiaImp/RayTracer

Conflicts:
	RT/RT/Triangle.h
	RT/RT/UniformGrid.h