player can now jump on enemy heads
forgot one line
fixed merge error and refactored health mod code
Merge remote-tracking branch 'origin/master' into dan-dev