new project
merged .gitignore