Tested code for adding users; database code now works!
m
Merge branch 'master' of ssh://github.com/amybear/quiz

Conflicts:
	build/classes/quiz/HistoryObject.class
	build/classes/quiz/User.class