permission change
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