added a ResourceType enum, working on Trade methods. Converted all inflation rates to ints.
Merge branch 'master' of https://github.com/2340-Group/SpaceTrader