bugs fixed
small fixes
some stuff
immediate feedback
timer works
Merge branch 'master' into bryant-debug

Conflicts:
	Quiz Website/WebContent/show_quiz.jsp
	Quiz Website/WebContent/take_quiz.jsp
Merge pull request #30 from kmblake/bryant-debug

Multiple pages, immediate feedback, timer
Merge branch 'master' into bryant-quizHistory

Conflicts:
	Quiz Website/WebContent/show_quiz.jsp
	Quiz Website/WebContent/take_quiz.jsp
Merge pull request #31 from kmblake/bryant-quizHistory

Bryant quiz history
Merge branch 'master' into Eric-Quiz-Fixes