domestic trade mostly works, fixed rejoin turntracker error i caused earlier
Merge branch 'master' of https://github.com/abe-austin/Catan