Initial commit
Fixed merge conflict in auto-generated gitignore