Added .gitignore
Resolved conflict