add .gitignore file
update readme
Merge branch 'develop'