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 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
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 branch 'master' into upc
onpostexecute now sets the text fields
Merge branch 'master' into upc

Conflicts:
	android/src/com/aj3/kiss/AddItemActivity.java
barcode scanning and upc lookup linked
Set visibility of the barcode so it is not seen
Merge pull request #29 from jsjones27/upc

It works. If you have an old version of the app installed you may need to uninstall and re-install to get internet permissions working