Merge origin/master

Conflicts:
	SpaceTrader/src/spacetrader/CharacterCreationController.java
Merge origin/master

Conflicts:
	SpaceTrader/src/spacetrader/CharacterCreationController.java
Merge origin/master

Conflicts:
	SpaceTrader/src/spacetrader/CharacterCreationController.java
Merge origin/master

Conflicts:
	SpaceTrader/src/spacetrader/CharacterCreationController.java
Merge origin/master

Conflicts:
	SpaceTrader/src/spacetrader/CharacterCreationController.java
	SpaceTrader/src/spacetrader/Market.fxml
	SpaceTrader/src/spacetrader/Ship.java
Merge origin/master

Conflicts:
	SpaceTrader/src/spacetrader/CharacterCreationController.java
	SpaceTrader/src/spacetrader/Market.fxml
	SpaceTrader/src/spacetrader/Ship.java