Merge origin/master

Updated cargo space to account for limits

Conflicts:
	src/spacetraders/NewGameController.java