Almost got collision detection working
Merge branch 'master' into collision