Added quiz and demo questions
Merge branch 'master' into comments-quiz