Add .gitignore
Merge with origin