updated .gitignore
merge with dev