DBConnectionUpdate

DBConnectionUpdate
Merge branch 'master' of https://github.com/zachyf/cs108quiz

Conflicts:
	src/quiz/DBConnection.java
dbresultions

dbresultions
Merge branch 'master' of https://github.com/zachyf/cs108quiz