single category working
Merge branch 'master' of https://github.com/dcdrake/cs421_database.git

Conflicts:
	cs421_project/src/cs421_project/Database.java