fucking shit penis
Merge branch 'master' of https://github.com/mrg1/QuizProject.git

Conflicts:
	QuizSite/build/classes/db/QuizSqlStatements.class
	QuizSite/build/classes/db/UserInfo.class
	QuizSite/build/classes/user/LoginServlet.class