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

Conflicts:
	ThePantry/src/cs169/project/thepantry/ThePantryContract.java
idono
Merge branch 'master' of github.com:jfmyers9/ThePantry
added pop up for update and clear in dbModel