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
created ship buying station
Merge branch 'master' of https://github.com/Rrego6/space_traders

Conflicts:
	SpaceTrader/res/txt/gameDataPlayer.json
	SpaceTrader/res/txt/gameDataUniverse.json
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 'master' of https://github.com/Rrego6/space_traders into ambrose

Conflicts:
	SpaceTrader/src/controller/ShipyardScreenController.java
	SpaceTrader/src/model/Ship.java