initial commit
.gitignore conflicts