new project
merge .gitignore