setting up the project
resolving conflicts in gitignore