Station trajectory bug fix
Collision detection improved
Merge branch 'master' of https://github.com/amhndu/gravity