Merge branch 'ivan' of https://github.com/Rrego6/space_traders into ivan

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