done
still working on asynctask
Merge remote-tracking branch 'origin/Binh'

Conflicts:
	POS/src/edu/txstate/pos/MainActivity.java
Merge remote-tracking branch 'origin/chris'