revising dbModel to include flags
merge fix
Merge branch 'master' of github.com:jfmyers9/ThePantry

Conflicts:
	ThePantry/gen/cs169/project/thepantry/R.java