frimin
Merge branch 'master' of https://github.com/ray-cast/ray

Conflicts:
	contrib/glew/CMakeLists.txt