Add .gitignore
Merge conflicts.