Added gitignore file
Merge branch 'master' into develop
Added .gitignore