integrating back the gitignore file from my branch