Reimplemented player jumping. I can work on that in another branch.
Fixed a jumping bug
merge master