Fixed bugs in quiz
More improvements to QuestionGenerator
Merge branch 'master' of github.com:nealyoung/Fabflix-Quiz

Merging from laptop