init
Merge conflict solved in .gitignore