ENCOUNTERS!!
Merge origin/master

Conflicts:
	SpaceTrader/src/spacetrader/EncounterController.java
	SpaceTrader/src/spacetrader/SolarMapController.java
Merge origin/master