user can jump out of water, still a few bugs, but functional for now
Merge branch 'master' of https://github.com/johannesgunnar/S