added the idea of a factory in the testPage so that one can advance questions
merged with conflicts
added QuestionFactory and made changes to multipleQuestion
Did a lot of refactoring, mostly moving question getters and setters into AbstractQuestion. Made progress on reading questions from XML file.
switches between questions when using the student test page
added switching between multiple choice and short answer question displays
Finished reading and writing to XML file, including support for all current question types.
Added facade interfaces to access certain methods in QuestionDatabase.
added hitting enter to log in, and sstarted work on adding a toolbar to handle accent marks
Added classes left behind.
fixed merge errors.
commiting before pushing.
Merge branch 'master' into prof-mult