Adds .gitignore
Resolves merge conflict.