Item: price expressed in Money
	new field: reducedPrice : Money
Merge remote-tracking branch 'origin/master'
Updated Class Diagram
Item with Money
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/Item.java
	src/PricedPerPiece.java
	test/PricedPerPieceTester.java