Methods added
MaritimeTrade.validateTrade();
Player.getTradeRateManager()
Player.setTradeRateManager(TradeRateManager manager)
Player.getSoldierCount()
Player.getMonumentCount()
ResourceType Player.stealCard()
UnusedPieces Player.getUnusedPieces()
Municipality.getPieceType()
Municipality.getVictoryPointVal()

Classes Added
Trade.TradeRate
Trade.TradeRateManager
UnusedPieces
Merge branch 'master' of https://github.com/gavinhoward/byu-cs340-sixmix

Conflicts:
	SettlersOfCatan/src/shared/map/City.java
	SettlersOfCatan/src/shared/map/Municipality.java
	SettlersOfCatan/src/shared/map/Settlement.java
Merge branch 'master' of https://github.com/gavinhoward/byu-cs340-sixmix