updating to merge
Merge branch 'master' of https://github.com/fls4507/MyPantry4

Conflicts:
	mptester/src/com/example/mptester/PantryItemAdapter.java