xx
xx
Merge https://github.com/shibing/simpleraycer

Conflicts:
	test.cpp
rm simpleraytracer.pro.user