Modified .gitignore file
Merging commit