fixed long line error
Merge branch 'addOptionsAndSubmissions' into addGrading
Fixed hound stuff
Merge branch 'addGrading' into UserSettings
Fix hound errors