Changes
Merge branch 'master' of https://github.com/grimfang/quickShadows

Conflicts:
	src/engine/engine.py