Starting to think about Mars
Concerns about Mars's moons on my furry friend
Thoughts about the climate
Add the ignore file
working?
Working?
try again
Merge branch 'master' of https://github.com/cgubert/planets

Conflicts:
	.gitignore
	mars.txt
saving ignore file
Merge branch 'master' of https://github.com/cgubert/planets
Adding a line in out home copy