initial commit
.gitignore conflcits