Added gitignore
Conflict