secret commit just for wolfmans eyes
Starting to think about Mars
Concerns about Mars's moons on my furry friend
Thoughts about the climate
Add the ignore file
commiting changes
Merge branch 'master' of https://github.com/dtrap/planets into shelter_plan

Conflicts:
	shelter.txt
adding shelter to the shelter_plan branch
modified shelter.txt
modified shelter.txt
Delete .gitignore
Added shelter.txt

Adding shelter.txt to the shelter_plan branch
Merge pull request #2 from wolfmanonmars/shelter_plan

Added shelter.txt
Update shelter.txt

Wanted to specify the biggest bedroom is for me!
Merge branch 'master' of https://github.com/dtrap/planets into shelter_plan

Conflicts:
	mars.txt
This merge is necessary to resolve the conflict with the remote and local repos

Merge branch 'shelter_plan' of https://github.com/dtrap/planets into shelter_plan
Updated shelter.txt

Based on Dracula and Mummy's input, I evened out the dimensions.
Merge pull request #3 from dtrap/shelter_plan

Shelter plan