test

test12
Merge branch 'william' of https://github.com/Ipmedt4b/Project4 into william

Conflicts:
	IPMEDT/gen/com/example/ipmedt/R.java
	IPMEDT/res/layout/SaleFragment.xml
	IPMEDT/res/layout/activity_main.xml
	IPMEDT/src/com/example/ipmedt/SaleFragment.java