Merge "Remove .gitignore file that does nothing"