Fix merge
Merge pull request #122 from mud-turtles-2014/quiz-troubleshooting

Fix merge