Implement both generation methods

Made it so the program will generate half of the questions using Gavins
code and half using the QuestionGenerator object.