pushed uncommited changes to my JUnit test
uhhh attempting to merge everything
special economies/events added to planets
Merge branch 'master' of https://github.com/gossipgirls/SpaceTraders2