The quiz and whatnot
Merge pull request #70 from spectralshadow514/master

The quiz and whatnot