testing DatabaseModel
Merge branch 'master' of github.com:jfmyers9/ThePantry

Conflicts:
	ThePantry/ThePantryTestTest/src/cs169/project/thepantry/test/DatabaseModelTest.java