Made baselist activity -- shop and inventory extend
Merge branch 'master' of github.com:jfmyers9/ThePantry

Conflicts:
	ThePantry/bin/R.txt
	ThePantry/gen/cs169/project/thepantry/R.java
	ThePantry/src/cs169/project/thepantry/InventoryActivity.java
	ThePantry/src/cs169/project/thepantry/InventoryAddActivity.java
	ThePantry/src/cs169/project/thepantry/ShoppingListActivity.java