more work on collision detection
Merge branch 'master' of https://github.com/rymo4/ColorSpace