initial commit
.gitignore conflict solved