debugging
Merge branch 'master' into debugTests
bleh
debugging in progress;
Hitbox is now working properly!
Merging master and solving conflicts
Will now not be collided when invicible
Solving conflicts once more
Merge branch 'master' into debugTests
Fixing mistakes