Fixed trap colliders, reset player back to z 0
Merge branch 'master' of https://github.com/mdirienzo/CandyJam