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
fixed travel
Merge branch 'master' of https://github.com/Rrego6/space_traders into ivan
added enum ship
added enum ship
added enum shipMerge branch 'master' of https://github.com/Rrego6/space_traders into noora

Conflicts:
	SpaceTrader/src/helper/GameData.java
	SpaceTrader/src/model/Player.java
	SpaceTrader/src/model/Ship.java
Changes to encounter

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

Conflicts:
	SpaceTrader/res/txt/gameDataPlayer.json
	SpaceTrader/res/txt/gameDataUniverse.json
	SpaceTrader/src/helper/GameData.java
Merge branch 'noora'
Merge branch 'master' of https://github.com/Rrego6/space_traders into ivan

Conflicts:
	SpaceTrader/res/txt/gameDataPlayer.json
Merge branch 'master' of https://github.com/Rrego6/space_traders into ivan

Conflicts:
	SpaceTrader/res/txt/gameDataPlayer.json
	SpaceTrader/res/txt/gameDataUniverse.json
Updated encounters. Should be ready for M7.
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
ui shipyard