Initial commit
Fixed merge conflict in gitignore