new science!
Merge branch 'master' of github.com:rmwoods/planets

Decided to have both sciences

Conflicts:
	mars.txt