Initial commit
merge conflict in .gitignore