changes to files
working on GameData
ui for save load game
ui for save and load
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
fixed bug
made popup unresizable, removed minimze and max
start location is automatically selected
added refuel functionality. added planet variance in prices
Merge branch 'master' of https://github.com/Rrego6/space_traders into ambrose

Conflicts:
	SpaceTrader/src/controller/StarChartController.java
	SpaceTrader/src/model/Inventory.java
	SpaceTrader/src/model/Player.java
	SpaceTrader/src/model/TradeGood.java