More stuff
Merge branch 'master' of https://github.com/bagedevimo/rays

Conflicts:
	src/ray=out.cpp