blah
blah
-blah
Merge branch 'master' of https://github.com/rgpayne/GroceryList

Conflicts:
	bin/classes/android/support/v7/appcompat/R$anim.class
	bin/classes/android/support/v7/appcompat/R$attr.class
	bin/classes/android/support/v7/appcompat/R$bool.class
	bin/classes/android/support/v7/appcompat/R$color.class
	bin/classes/android/support/v7/appcompat/R$dimen.class
	bin/classes/android/support/v7/appcompat/R$drawable.class
	bin/classes/android/support/v7/appcompat/R$id.class
	bin/classes/android/support/v7/appcompat/R$integer.class
	bin/classes/android/support/v7/appcompat/R$layout.class
	bin/classes/android/support/v7/appcompat/R$string.class
	bin/classes/android/support/v7/appcompat/R$style.class
	bin/classes/android/support/v7/appcompat/R$styleable.class
	bin/classes/android/support/v7/appcompat/R.class
	bin/classes/com/example/grocerylist/AddItemDialogFragment$AddItemDialogListener.class
	bin/classes/com/example/grocerylist/AddItemDialogFragment.class
	bin/classes/com/example/grocerylist/BuildConfig.class
	bin/classes/com/example/grocerylist/DummyService$1.class
	bin/classes/com/example/grocerylist/DummyService.class
	bin/classes/com/example/grocerylist/ExpandableList$1.class
	bin/classes/com/example/grocerylist/ExpandableList.class
	bin/classes/com/example/grocerylist/ExpandableListAdapter.class
	bin/classes/com/example/grocerylist/GroceryItem$1.class
	bin/classes/com/example/grocerylist/GroceryItem.class
	bin/classes/com/example/grocerylist/GroceryList.class
	bin/classes/com/example/grocerylist/ItemLocation$1.class
	bin/classes/com/example/grocerylist/ItemLocation.class
	bin/classes/com/example/grocerylist/LocationToolbox.class
	bin/classes/com/example/grocerylist/R$anim.class
	bin/classes/com/example/grocerylist/R$attr.class
	bin/classes/com/example/grocerylist/R$bool.class
	bin/classes/com/example/grocerylist/R$color.class
	bin/classes/com/example/grocerylist/R$dimen.class
	bin/classes/com/example/grocerylist/R$drawable.class
	bin/classes/com/example/grocerylist/R$id.class
	bin/classes/com/example/grocerylist/R$integer.class
	bin/classes/com/example/grocerylist/R$layout.class
	bin/classes/com/example/grocerylist/R$menu.class
	bin/classes/com/example/grocerylist/R$string.class
	bin/classes/com/example/grocerylist/R$style.class
	bin/classes/com/example/grocerylist/R$styleable.class
	bin/classes/com/example/grocerylist/R.class
	bin/dexedLibs/android-support-v7-appcompat-57e0ef7e9a35a780d5c8ef40c1668f66.jar
	bin/dexedLibs/appcompat_v7-d6cfa7d5149ddb4e1572d2f55ada2661.jar
	gen/android/support/v7/appcompat/R.java
	gen/com/example/grocerylist/R.java
	src/com/example/grocerylist/AddItemDialogFragment.java
	src/com/example/grocerylist/DummyService.java
	src/com/example/grocerylist/ExpandableList.java
	src/com/example/grocerylist/ExpandableListAdapter.java
	src/com/example/grocerylist/GroceryItem.java
Merge branch 'master' of https://github.com/rgpayne/GroceryList

Conflicts:
	src/com/example/grocerylist/ExpandableList.java