Creating empty gitignore
Fixing merge conflict on gitignore