Makin it perrrrty
Makin it perrrrty
Mercenaries and Encounters, oh my
Merge origin/test into test

Conflicts:
	WorkInProgress/src/controller/ShipController.java
	WorkInProgress/src/controller/WelcomeScreenController.java
	WorkInProgress/src/view/Ship.fxml