quizservlet
Merge branch 'master' of https://github.com/mrg1/QuizProject.git

Conflicts:
	QuizSite/src/quiz/QuizServlet.java
Merge branch 'master' of https://github.com/mrg1/QuizProject.git
Merge branch 'master' of https://github.com/mrg1/QuizProject.git
cleaned up some layout stuff, added ability to remove admin
Merge branch 'master' of https://github.com/mrg1/QuizProject.git

Conflicts:
	QuizSite/WebContent/admin.jsp
	QuizSite/WebContent/index.jsp
Merge branch 'master' of https://github.com/mrg1/QuizProject.git
Merge branch 'master' of https://github.com/mrg1/QuizProject.git