Fixes to quiz display formatting
Merge branch 'master' of github.com:zachyf/cs108quiz
Merge branch 'master' of github.com:zachyf/cs108quiz
Merge branch 'master' of github.com:zachyf/cs108quiz
Fixed formatting bug on userWelcome and bug in MultipleChoiceMultipleAnswer
Merge branch 'master' of github.com:zachyf/cs108quiz
Removed broken button from quiz page
Merge branch 'master' of github.com:zachyf/cs108quiz
Merge branch 'master' of github.com:zachyf/cs108quiz

Conflicts:
	WebContent/quizPage.jsp