fixed first round of errors
Merge branch 'master' of https://github.com/mrg1/QuizProject.git