Merge branch 'dev'
Update README.md
ADd .gitignore file
Merge branch 'master' into dev