QuizDao + Quiz
added quiz.class
resolved merge conflict in quizdao