Made merchant money generated more intuitively. If this is a problem, I can put the old method back.
Merge branch 'master' of https://github.com/RyanYoung25/UndiscoveredWorlds