rename, gitignore
I don't know what I'm merging??