Fixed some DBConnection stuff in classes
Merge branch 'master' into bryant-branch

Conflicts:
	Quiz Website/src/quiz/AccountManager.java
	Quiz Website/src/quiz/Quiz.java
Fixed some stuff

Shows quiz id
rudimentary take_quiz stuff
Merge branch 'master' into bryant-branch

Conflicts:
	Quiz Website/src/quiz/FillInTheBlank.java
	Quiz Website/src/quiz/PictureResponse.java
Merge pull request #20 from kmblake/bryant-branch

Bryant branch
making Take Quiz Servlet
Merge pull request #21 from kmblake/Take-a-quiz

making Take Quiz Servlet
Merge branch 'master' into Style-enhancements