test on nvidia
Merge branch 'master' of github.com:antigol/raytracer2

Conflicts:
	raytracer_inline.frag