Update README.md
Updating gitignore
Merge branch 'master' into develop