Merge pull request #38 from sapresearch/alexis-dev

Trying to fix my permissions at the same time
Fixed a query
Merge branch 'master' of https://github.com/sapresearch/fuzzy_adventure into alexis-dev