Merge pull request #31 from kmblake/bryant-quizHistory

Bryant quiz history
about to merge master fixed quiz history stuff
Merge pull request #32 from kmblake/Eric-Quiz-Fixes

about to merge master fixed quiz history stuff