Merge branch 'noora' of https://github.com/Rrego6/space_traders into noora
minor changes to controller
created Enum renamed tradegood
the enum trade good class
Merge branch 'noora'

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

M5 Patches