More changes
Conflict resolution
Another attempt at conflict resolution
Merge branch 'master' of https://github.com/keirkwame/planets