minor changes to controller
Merge branch 'noora'

Conflicts:
	SpaceTrader/src/controller/PlanetDrawScreenController.java
Merge branch 'master' of https://github.com/Rrego6/space_traders into noora