Merge branch 'master' into BadTestQuestions

This quiz has 5 answer choices instead of our usual max of 4, and we
need some special displays because this quiz is about the answers
themselves
Clean up css

fix white space and delete some old stuff