Merge for GameController
Merge for CharacterConfigurationController
Merge for SpaceTrader.java
Merge for Player
Moved Player.java
Added Player, Ship, etcetera and etcetera
Merged SpaceTrader.java
Merged SpaceTrader.java
Merged SpaceTrader.java
Merge origin/master

Conflicts:
	SpaceTrader/src/spacetrader/SpaceTrader.java