Add bonus class (not complete)
Merge remote-tracking branch 'origin/quiz' into base