changes to files
working on GameData
created popup
Merge branch 'master' of https://github.com/Rrego6/space_traders

Conflicts:
	SpaceTrader/src/controller/StarChartController.java
	SpaceTrader/src/controller/WelcomeScreenController.java
	SpaceTrader/src/helper/GameData.java
	SpaceTrader/src/model/Player.java
	SpaceTrader/src/model/SolarSystem.java
	SpaceTrader/src/model/TradeGood.java