added more methods to Economy.java going to implement a supply/demand system tonight.
Merge branch 'master' of https://github.com/2340-Group/SpaceTrader