added a fix for collision
Merge branch 'master' of https://github.com/dfoley23/InfiniteJumpEngine into prototype-Kevin