minor changes in quiz.jsp
fixed merged conflict
Merge branch 'master' of github.com:yogendra-pant/online_quiz

Conflicts:
	src/test/java/com/quiz/ContestServiceTest.java