changed collision logic
Merge branch 'master' of github.com:Azmisov/snow