Move some stuff around to make cuPrintf compile
Merge branch 'master' of https://github.com/timvdalen/massive-data-collisions
Merge branch 'master' of https://github.com/timvdalen/massive-data-collisions
ms time measure
Merge branch 'master' of https://github.com/timvdalen/massive-data-collisions

Conflicts:
	code/src/BVH.cu
Add GPU assertions and available memory checks
Merge branch 'master' of https://github.com/timvdalen/massive-data-collisions