first commit
.gitignore merge