add .gitignore file
Merge branch 'master' into remote_branch