raoul unit test
Merge branch 'master' of https://github.com/Rrego6/space_traders

Conflicts:
	SpaceTrader/src/controller/StarChartController.java
	SpaceTrader/src/model/SolarSystem.java