merging, but not fully fixed yet
broken merging
Merge branch 'master' of https://github.com/Casket/marsh-game-files
finished up levelup by making it use spell points.