Gitignore added
Gitignore conflict resolved