minor bug fixes
Merge branch 'master' of https://github.com/Casket/marsh-game-files
working with adding transparency
Merge branch 'master' of https://github.com/Casket/marsh-game-files