Initial commit
Fix merge conflict in gitignore