TradeItem Constructor
Merge remote-tracking branch 'origin/master'

Conflicts:
	WorkInProgress/src/model/TradeItem.java