hopefully this works
hopefully this works
Merge branch 'master' of github.com:jfmyers9/ThePantry

Conflicts:
	ThePantry/.DS_Store
	ThePantry/bin/R.txt
	ThePantry/bin/ThePantry.apk
	ThePantry/bin/classes.dex
	ThePantry/bin/dexedLibs/slidingmenulibrary-674e7d712be5e2d2465d05c4dcfcb6b4.jar
	ThePantry/bin/resources.ap_
	ThePantry/gen/cs169/project/thepantry/R.java
	ThePantry/res/layout/activity_inventory_add.xml
	ThePantry/src/cs169/project/thepantry/InventoryActivity.java
	ThePantry/src/cs169/project/thepantry/ShoppingListActivity.java
fuck this
this should work
dono whats going on