Geoff
adding public_html from master
Commit before renaming
Changed the name
Made RemoteStorage an abstract class.  Pulled out UserRemoteStorage.
User.pl now includes login backed by UserDAO.pm.
Updating code
Merge branch 'master' into geoff

Conflicts:
	POSTest/src/test/edu/txstate/pos/storage/remote/Login.java
	POSTest/src/test/edu/txstate/pos/storage/remote/UserTest.java
	public_html/cgi-bin/user.pl
	public_html/sql/tables.sql
permission change
initial chris branch
Merge remote-tracking branch 'origin/geoff'
Merge remote-tracking branch 'origin/master' into geoff
Working on Item storage
Added Scan Activity and a 'skip to scan' button on the main activity;
changed minSDKversion to 11 and theme to system:holo
Working
Back to working - made me want to punch a baby
Faked up login from a home page that starts everything up
About to merge
Merge remote-tracking branch 'origin/geoff'

Conflicts:
	POS/AndroidManifest.xml
	POS/res/values/strings.xml
	POS/src/edu/txstate/pos/MainActivity.java
Merge remote-tracking branch 'origin/Binh'

Conflicts:
	POS/AndroidManifest.xml
	POS/res/values/strings.xml
Changed backend server