Modifying testdatabase for new DatabaseModel
Merge branch 'master' of github.com:jfmyers9/ThePantry

Conflicts:
	ThePantry/assets/databases/thepantry.zip