purchase order complete -checkout
purchase order complete -checkout2
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/OSIA.apk
	bin/classes.dex
	bin/classes/com/cse470/osia/DatabaseHandler.class
	bin/classes/com/cse470/osia/PurchaseOrder.class
	bin/classes/com/cse470/osia/R$id.class
	bin/classes/com/cse470/osia/R$layout.class
	bin/classes/com/cse470/osia/R$menu.class
	bin/classes/com/cse470/osia/R$string.class
	bin/classes/com/cse470/osia/R$style.class
	bin/classes/com/cse470/osia/SalesOrder.class
	bin/classes/com/cse470/osia/SalesOrderAddItem.class
	bin/classes/com/cse470/osia/ViewInventory.class
	bin/resources.ap_
	gen/com/cse470/osia/R.java