fixed merge
updated .gitignore
Fixed .gitignore