merge
a
Added add announcements feature
announcements
Merge branch 'master' of https://github.com/integralhero/quizzer
merge
Conflicts:
	bin/FETCH_HEAD
	bin/ORIG_HEAD
	bin/index
	bin/index.jsp
	bin/logs/HEAD
	bin/logs/refs/heads/master
	bin/logs/refs/remotes/origin/master
	bin/quiz/IndexServlet.class
	bin/refs/heads/master
	bin/refs/remotes/origin/master