merged
Merge branch 'master' of https://github.com/iuval/fuzzy-adventure