Changed fuel
Merge origin/master

Conflicts:
	src/spacetraders/SpaceTraders.java