all Quiz.java works with DAL
fixed merge conflicts