fixing stuff
Merge branch 'master' of https://github.com/sturmE/raytracer

Conflicts:
	src/instantRadiosity.cpp
	src/instantRadiosity.h