pre-merge
pre-merge
Merge remote-tracking branch 'origin/master'

Conflicts:
	QuizSite/.settings/org.eclipse.wst.common.component
added basic framework for quiz homepage
update homepage to have username shown
testing class commits
Merge remote-tracking branch 'origin/master'

Conflicts:
	QuizSite/bin/db/UserInfo.class
	QuizSite/bin/user/CreateServlet.class
	QuizSite/bin/user/LoginServlet.class