permission change
Merge remote-tracking branch 'origin/master' into geoff
added my code
Working on Item storage
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
transferred all code over
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
changed launch app name to match main application name