fixed some more sorting
fixed collision (maybe)
Merge branch 'master' of github.com:BattleRattle/gamejam-5