Merge pull request #3 from dtrap/shelter_plan

Shelter plan
shelter.txt change
Merging conflict
Merge branch 'master' of https://github.com/dtrap/planets into shelter_plan