1. This is another change
Merge branch 'master' of https://github.com/Shadowphax/planets

Conflicts:
	newfile1.txt