in progress ...
Merge branch 'rewrite' of github.com:amsibamsi/thegame into rewrite

Conflicts:
	src/main/thegame/raytracing.clj