A bunch of fixing
Merge branch 'master' of github.com:Bowbaq/question-generation