after trying to solve bug
uncommented
Merge branch 'master' of https://github.com/mrg1/QuizProject.git
Merge branch 'master' of https://github.com/mrg1/QuizProject.git
fixed title error
adds java stuff for announcements
Merge branch 'master' of https://github.com/mrg1/QuizProject.git
Started to implement quiz.jsp page
Merge branch 'master' of https://github.com/mrg1/QuizProject.git

Conflicts:
	QuizSite/src/db/UserInfo.java