added .ssh/ to .gitignore
merged .gitignore