Fixed testing
Merge branch 'master' of github.com:amybear/quiz
Merging fixed testing