syncing in
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/OSIA.apk
	bin/classes.dex
	bin/classes/com/cse470/osia/ViewInventory$2$1.class
	bin/classes/com/cse470/osia/ViewInventory$2$2.class
	bin/classes/com/cse470/osia/ViewInventory$2.class
	bin/classes/com/cse470/osia/ViewInventory.class
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/OSIA.apk
	bin/classes.dex
	bin/classes/com/cse470/osia/ViewInventory$2.class