update build.xml
Merge branch 'master' of github.com:jleefish/java3FinalProject

Conflicts:
	build/test/results/TEST-pricing.PriceScheduleTest.xml
	build/test/results/TEST-pricing.RentalBeanTest.xml
	build/test/results/TEST-pricing.RentalFormValidatorTest.xml