prior to collectstatic
Merge branch 'master' of https://github.com/sapresearch/fuzzy_adventure into mehlcat-dev
Merge pull request #27 from sapresearch/alexis-dev

Support list of answers
webdemo second tab beginning
merge conflict
merge conflict
starting views
unfinished
Some improvements to fit the questions
Merge branch 'master' of https://github.com/sapresearch/fuzzy_adventure
fixed the 'None' Value
fixed the 'None' Value
Merge branch 'master' of https://github.com/sapresearch/fuzzy_adventure into mehlcat-dev
Merge pull request #28 from sapresearch/mehlcat-dev

Mehlcat dev
initial file and .htm upload
Contact page finished
superfluous images
Merge pull request #30 from sapresearch/mehlcat-dev

Giddy up
about page
Merge branch 'master' of https://github.com/sapresearch/fuzzy_adventure into mehlcat-dev