changed main a bit
Merge branch 'master' of https://github.com/fueltherage/SDLServerGame

Conflicts:
	SpaceServer/projectCopy_Physics/BaseProject/BaseProject.sdf