temp addition
Latest
Try2
Merge branch 'master' of https://github.com/HanoMaree/planets

Conflicts:
	mars.txt
	newfile.txt
Another try
Merge branch 'master' of https://github.com/HanoMaree/planets

Conflicts:
	mars.txt