fixed travel
Changes to encounter

Conflicts:
	SpaceTrader/src/controller/StarChartController.java
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.
Merge branch 'ivan' of https://github.com/Rrego6/space_traders into ambrose

Conflicts:
	SpaceTrader/src/controller/StarChartController.java