Changed x-ray to y-ray
Merge branch 'master' of https://github.com/shamanhy/Planets

Decide to use both spectrometers

Conflicts:
	mars.txt