Set up basic display for Multiple Choice Question
added graphical component for multiple choice question
Merge branch 'master' into multiple_choice_graphical
new page for MCQ interface, added Test page
new page for MCQ interface, added Test page
submit button now functions and prints out the string associated with the selected radio button
added Short Answer Questions as an option for available question types
changed back to multiple choice
fixed merge conflicts (it)
fixed it