Modified gitignore file
Fixed merge conflict in README file