Added #quiz type of code block, for inserting brief quizzes
Merging master into gh-pages