somewhat improved collision
Merge branch 'master' of github.com:tobyp/ludum-dare-30