Video questions updated to take between 2 and 5 questions
Merge remote-tracking branch 'upstream/master'