fix model to more closely resemble ta's crappy model
Merge branch 'master' of https://github.com/reedcwilson/catan