Use correct_answer helper
Merge branch 'take-a-quiz'