Trying to find the fault within our collisions
Merge branch 'master'
Trying to find the falling through bug
Merge branch 'master'
slight change to knockback for bounce on enemies
Merged the stuff after a long absence
small comments