add a .gitignore to this project
merge