added serializable imports and implementations
Merge branch 'Save/Load' into kristen
Added Game and UniverseScreen, Updated NewGameWindow, Program now officially creates player
Added controlsFX library
Added Game and UniverseScreen, Updated NewGameWindow, Program now officially creates player

Conflicts:
	SpaceTrader/src/spacetrader/Game.java
	SpaceTrader/src/spacetrader/MarketScreen.fxml
	SpaceTrader/src/spacetrader/MarketScreenController.java
	SpaceTrader/src/spacetrader/UniverseScreen.fxml
	SpaceTrader/src/spacetrader/UniverseScreenController.java
fixed branch Sydni