Edit to mars.txt
Merge branch 'master' of https://github.com/Thanh-Lan/Test

Conflicts:
	mars.txt