Merging .gitignore file from master