initial import: .gitignore
test
.gitignore conflict resolved