Allow for multiple question types
Merge pull request #33 from alphagov/allow-for-multiple-question-types

[merge after 32] Allow for multiple question types