Fixed bugs in login caused by addition of recentActivity field to
DBTables.sql
Merge branch 'master' of ssh://github.com/amybear/quiz

Conflicts:
	build/classes/quiz/QuizTest.class
	build/classes/quiz/User.class
	src/quiz/QuizTest.java