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
test saves
ui changes to orbit screen
makes screen unresizable
makes screen unresizable
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