Messing with conflicts
Merge branch 'master' of https://github.com/marioparreno/planets

Conflicts:
	Readme.txt