Gas giants have feelings too
Merge remote-tracking branch 'origin/gas-giants'

Conflicts:
	README.txt