add getCost() to calculate cost of trade goods.
Added Ship abstract class with minimal inventory functionality, as well as draft of trade window
add getCost() to calculate cost of trade goods.
Merge origin/noora into ambrose
Merge branch 'noora' of https://github.com/Rrego6/space_traders into noora
minor changes to controller
Merge branch 'master' of https://github.com/Rrego6/space_traders into ambrose
created Enum renamed tradegood
the enum trade good class
Modified PlanetDrawScreenController to save the solar system
M5 Progress
Merge branch 'noora'

Conflicts:
	SpaceTrader/src/controller/PlanetDrawScreenController.java
M5 Progress
the enum trade good class
M5 Progress
M5 Progress
Merge branch 'master' of https://github.com/Rrego6/space_traders into noora
M5 Progress
M5 Progress
M5 Complete