Merge pull request #33 from SamLau95/addOptionsAndSubmissions

Remove options and question types
Merge pull request #35 from SamLau95/addGrading

Add grading
Fix indentation
Merge pull request #36 from SamLau95/UserSettings

User settings
Merge conflicts
Hound stuff