Git confusion

I don't think I had everything in the last pull request. I'm still a git noob.