changed score constructor
after pull
regathering everything
Merge branch 'master' of https://github.com/mrg1/QuizProject.git

Conflicts:
	QuizSite/WebContent/homepage.jsp
	QuizSite/WebContent/quiz.jsp
	QuizSite/src/db/UserInfo.java
commit homepage