Modifying .gitignore; users should have their own global .gitignore
Merge remote branch 'origin/master'
Updating .gitignore