some guard updates
Merge branch 'master' of https://github.com/Casket/marsh-game-files
trying to make it work