updated .gitignore
merged