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