TradeScreen almost working

won't let player choose two different resources for the one they want to
trade 3 of and the one they want 1 of -- PROBLEMO
Merge branch 'master' of https://github.com/sophgersh/Per7-Gershon-Ghaemi-SGsquared

Conflicts:
	Settlers/Player.pde
	Settlers/RightSide.pde