finished changing quest givers, updated solid sprite to have a new type
Merge branch 'master' of https://github.com/Casket/marsh-game-files