changed up the login screen to simplify things
Merge branch 'master' of https://github.com/gmarinsk/droid

Conflicts:
	POS/bin/classes/edu/txstate/pos/MainActivity.class
	POS/bin/classes/edu/txstate/pos/model/User.class