question logic implemented
Merge branch 'question-logic' into stage3