Finished test for classic vacations
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/test/java/PurchaseTest.java