added trading functionality
Merge pull request #31 from jjacobskind/trade_resources

added trading functionality and 'hasSettlementOrCity' to vertex