merge pull requests to master
add .gitignore