change by sanjeev
Merge branch 'master' of https://github.com/kornsanz/OnlineQuiz.git

Conflicts:
	OnlineQuiz/src/main/java/com/oq/subject/Category.java
	OnlineQuiz/src/main/webapp/index.jsp