Bug fix: Templates caused code to freeze
Adding quiz histories
Merging master into gh-pages