updated .gitignore
merge