Added two new types of questions
Merge branch 'master' of github:soton-ecs-2014-gdp-12/videogular-questions