added commented out test code
internet permission
Merge branch 'master' into upc

Conflicts:
	android/src/com/example/kiss/MainActivity.java
Merge branch 'master' into upc
Merge branch 'master' into upc
added Zxing lib
Code added to return the product code via barcode scanning
Added IntentIntegrator and IntentResult classes
removed files from android/src/com/example pkg
added asynctask to additemactivity for upc lookup
Merge branch 'master' into upc

Conflicts:
	android/AndroidManifest.xml
	android/src/com/aj3/kiss/AddItemActivity.java
cleaned up getitemfromupc
Merge pull request #12 from jsjones27/database

Seems good, we need to figure out this problem with new installs/changing the database though.
added comment at top of getitemfromupc to describe how to use (this is
for you, aishwarya!
Merge branch 'master' into upc

Conflicts:
	android/src/com/aj3/kiss/MainActivity.java

	conlflicts resolved
Merge pull request #26 from jsjones27/database

addToGrocery and addToInventory now use the same helper function
Merge branch 'master' into upc
Removed unused imports
Fixed XML layout issue
Merge branch 'master' into scaning

Conflicts:
	android/src/com/aj3/kiss/AddItemActivity.java