asdf
asdf
asdf
Merge branch 'master' into multiple-answers
Merge branch 'master' into multiple-answers
prettier feedback
Merge pull request #37 from kmblake/multiple-answers

Multiple answers
average time and average score functional
quiz summary page finished
about to merge master
Merge pull request #38 from kmblake/Eric-edits

Eric edits
practice mode works
Merge pull request #39 from kmblake/practice-mode

practice mode works
updated user pages to make quizzes hotlink

also show time
Merge pull request #40 from kmblake/Eric-edits

updated user pages to make quizzes hotlink
Merge branch 'master' into homepage

Conflicts:
	Quiz Website/WebContent/home.jsp