Untrack a file added by accident
Pick the .gitignore file from the master branch