Updated README
Updated README
Updated README
end of monday commit
Successfully scan new products from barcode to add to list.
Updated and fixed .gitignore
Can create new QR code for cashier after posting list to server.
Merge branch 'master' of https://github.com/nohsamp/cmu-mse-costcode

Conflicts:
	mobile/bin/AndroidManifest.xml
	mobile/bin/classes.dex
	mobile/bin/classes/cmu/costcode/FloorPlan/.DS_Store
	mobile/bin/classes/cmu/costcode/FloorPlan/FloorPlan.class

mobile/bin/classes/cmu/costcode/ProximityAlert/NotificationActivity.clas
s

mobile/bin/classes/cmu/costcode/ProximityAlert/ProximityIntentReceiver.c
lass
	mobile/bin/classes/cmu/costcode/ShoppingList/.DS_Store
	mobile/bin/classes/cmu/costcode/ShoppingList/EditListActivity$1.class
	mobile/bin/classes/cmu/costcode/ShoppingList/EditListActivity.class
	mobile/bin/classes/cmu/costcode/ShoppingList/LoginActivity.class
	mobile/bin/classes/cmu/costcode/ShoppingList/R$drawable.class
	mobile/bin/classes/cmu/costcode/ShoppingList/R$id.class
	mobile/bin/classes/cmu/costcode/ShoppingList/R$layout.class
	mobile/bin/classes/cmu/costcode/ShoppingList/R$menu.class
	mobile/bin/classes/cmu/costcode/ShoppingList/R$string.class
	mobile/bin/classes/cmu/costcode/ShoppingList/R$style.class
	mobile/bin/classes/cmu/costcode/ShoppingList/R$xml.class
	mobile/bin/classes/cmu/costcode/ShoppingList/ViewListActivity$1.class
	mobile/bin/classes/cmu/costcode/ShoppingList/ViewListActivity.class

mobile/bin/classes/cmu/costcode/ShoppingList/WiFiScanSettingsActivity$1.
class

mobile/bin/classes/cmu/costcode/ShoppingList/db/DatabaseAdaptor$Database
Helper.class
	mobile/bin/classes/cmu/costcode/ShoppingList/db/DatabaseAdaptor.class

mobile/bin/classes/cmu/costcode/ShoppingList/db/DbContract$AccessPointEn
try.class

mobile/bin/classes/cmu/costcode/ShoppingList/db/DbContract$AlertsEntry.c
lass

mobile/bin/classes/cmu/costcode/ShoppingList/db/DbContract$CategoryEntry
.class

mobile/bin/classes/cmu/costcode/ShoppingList/db/DbContract$InfoVersionEn
try.class

mobile/bin/classes/cmu/costcode/ShoppingList/db/DbContract$ItemEntry.cla
ss
	mobile/bin/classes/cmu/costcode/ShoppingList/objects/.DS_Store
	mobile/bin/classes/cmu/costcode/ShoppingList/objects/Customer.class
	mobile/bin/classes/cmu/costcode/ShoppingList/objects/Item.class

mobile/bin/classes/cmu/costcode/ShoppingList/objects/ShoppingListItem.cl
ass
	mobile/bin/classes/cmu/costcode/Triangulation/WCL$1.class
	mobile/bin/classes/cmu/costcode/Triangulation/WCL.class
	mobile/bin/classes/cmu/costcode/simplifiedcheckout/nfc/.DS_Store

mobile/bin/classes/cmu/costcode/simplifiedcheckout/nfc/CustomerNFC$1.cla
ss

mobile/bin/classes/cmu/costcode/simplifiedcheckout/nfc/CustomerNFC.class

mobile/bin/classes/cmu/costcode/simplifiedcheckout/web/CustomerWeb$1.cla
ss

mobile/bin/classes/cmu/costcode/simplifiedcheckout/web/CustomerWeb.class

mobile/bin/classes/cmu/costcode/simplifiedcheckout/web/HttpJsonClient.cl
ass
	mobile/bin/resources.ap_
	mobile/gen/cmu/costcode/ShoppingList/R.java
	mobile/res/menu/list_qrdisplay.xml
	mobile/src/cmu/costcode/ShoppingList/EditListActivity.java
	mobile/src/cmu/costcode/ShoppingList/ListQRDisplayActivity.java
	mobile/src/cmu/costcode/ShoppingList/LoginActivity.java
	mobile/src/cmu/costcode/ShoppingList/ViewListActivity.java
	mobile/src/cmu/costcode/ShoppingList/db/DatabaseAdaptor.java
	mobile/src/cmu/costcode/ShoppingList/db/DbContract.java
	mobile/src/cmu/costcode/ShoppingList/objects/Item.java
	mobile/src/cmu/costcode/simplifiedcheckout/web/CustomerWeb.java