refactoring question types and order
Merge branch 'master' of https://github.com/sonikandpikachu/wc_work