Fix bug with order of difition of tp and collision, add tests.
Merge branch 'master' of https://github.com/horror/d2d-shooter_game
Fix conflict errors
Merge branch 'master' of https://github.com/horror/d2d-shooter_game