Jumping and Box2d work
fixed merger error