New JUnit testing framework, modified DatabaseModel for testing and activity classes to use modified DatabaseModel
Merge branch 'master' of github.com:jfmyers9/ThePantry

Conflicts:
	ThePantry/src/cs169/project/thepantry/DatabaseModel.java
	ThePantry/src/cs169/project/thepantry/InventoryActivity.java
	ThePantry/src/cs169/project/thepantry/InventoryAddActivity.java
	ThePantry/src/cs169/project/thepantry/ShoppingListActivity.java