Updated .gitignore from master