Fixed the build
Merge branch 'master' of https://github.com/gfokkema/RT-Raytracing

Conflicts:
	src/devices/cudadevice.cpp