Simplified mart & npcJumping stuff
Merge branch 'master' of https://github.com/ThunderHawks/The-Hook