chris committed this
Merge branch 'master' of https://github.com/zengdiwuhan/planets

Conflicts:
	mars.txt