committing to pull
Merge https://github.com/Fallacies-TE/GravSim

Conflicts:
	GravitySimulator/gravSim
fixed issue with Ship