question handling
Merge pull request #8 from rgschneider/johanna_feature

question handling