fuck this
Merge branch 'master' of github.com:jfmyers9/ThePantry
inventory update stuff kinda working
Merge branch 'master' of github.com:jfmyers9/ThePantry

Conflicts:
	ThePantry/.classpath
	ThePantry/bin/R.txt
	ThePantry/gen/com/slidingmenu/lib/R.java
	ThePantry/gen/cs169/project/thepantry/R.java
	ThePantry/res/values/strings.xml
	ThePantry/src/cs169/project/thepantry/DatabaseModel.java
	ThePantry/src/cs169/project/thepantry/InventoryAddActivity.java
	ThePantry/src/cs169/project/thepantry/ShoppingListActivity.java
Merge branch 'master' of github.com:jfmyers9/ThePantry