prior to collectstatic
Merge branch 'master' of https://github.com/sapresearch/fuzzy_adventure into mehlcat-dev
webdemo second tab beginning
merge conflict
merge conflict
starting views
unfinished
Merge branch 'master' of https://github.com/sapresearch/fuzzy_adventure into mehlcat-dev
Merge pull request #28 from sapresearch/mehlcat-dev

Mehlcat dev