Making a conflict in the home copy
Merge branch 'master' of https://github.com/jm486white/planets