Merge branch 'develop'
added the gitignore file
Merge branch 'master' into develop