Merge pull request #151 from Harvard-ATG/dev

Fixing results
Merge pull request #152 from Harvard-ATG/dev

Dev
Merge branch 'master' of github.com:Harvard-ATG/Quizmo into dev