Update .gitignore
Merged with mater