housewife-ing
code nanny part deux
merge conflict
delete comment
GUI beginnings
question form now working
marginal update
blocked by master being broken
Merge branch 'master' of https://github.com/sapresearch/fuzzy_adventure into mehlcat-dev
passing off to alex
Web demo fix
Merge pull request #24 from sapresearch/mehlcat-dev

GUI madness