done
Cart start
Cart is starting to shape up
Add items to cart done
Cart item delete works
Starting on user admin
User admin starts up
manual activity
Cart working with manual payment.  Starts up payanywher application, but
needs test outside of emulator.
Pretty much done
cleaning up
done
Merge remote-tracking branch 'origin/Binh'

Conflicts:
	POS/src/edu/txstate/pos/MainActivity.java
Merge remote-tracking branch 'origin/chris'
added class diagrams for db, pos, and pos.storage.  Continuing to work
on Price Check