merge puntis changes
Merge branch 'master' of https://github.com/sapresearch/fuzzy_adventure into temp_changes
Merge pull request #40 from sapresearch/temp_changes

merge puntis changes