added .gitignore
merge