actual master
gitignore updated
Merge branch 'master' into staging
auto-deploy for master branch
deploy test
Merge branch 'master' into staging