first commit
gitignore conflict