Filled out ShelterActivity
fixed merge conflicts