Add .gitignore file
Merge from remote