change the fifth line
Merge branch 'master' of https://github.com/hadimeshgi/planets

Conflicts:
	mars.txt