Fixed .gitignore
merge