added quest completion, merging
Merge branch 'master' of https://github.com/Casket/marsh-game-files
Merge branch 'master' of https://github.com/Casket/marsh-game-files
Merge branch 'master' of https://github.com/Casket/marsh-game-files
implemented the interaction objective so that it works
Merge branch 'master' of https://github.com/Casket/marsh-game-files