added quiz.jsp file
fixed merge conflict