fixed things that were broke
merging
Merge branch 'master' of https://github.com/Casket/marsh-game-files