Wall jump partially implemented
Added double jump, fixed merge errors.