first commit
gitignore conflits