Quizzes now connect to database
Silly pom.properties!
Merge branch 'master' of github.com:chrisn21/team6

Conflicts:
	src/main/java/com/team6/app/AccountController.java
	src/main/webapp/WEB-INF/views/login.jsp
	target/m2e-wtp/web-resources/META-INF/maven/com.team6/app/pom.properties