button now appears, allowing player to travel to solar system
Merge origin/master

Conflicts:
	SpaceTrader/src/spacetrader/SolarSystemViewController.java
	SpaceTrader/src/spacetrader/SpaceTrader.java
	SpaceTrader/src/spacetrader/StarScreen.fxml
	SpaceTrader/src/spacetrader/StarScreenController.java
Merge origin/master
Merge origin/master

Conflicts:
	SpaceTrader/src/spacetrader/SolarSystemViewController.java
	SpaceTrader/src/spacetrader/SpaceTrader.java
	SpaceTrader/src/spacetrader/StarScreen.fxml
	SpaceTrader/src/spacetrader/StarScreenController.java