actual master
gitignore updated
merge from master
auto-deploy for master branch
deploy test
auto deploy modified
Merge branch 'master' into testing