use the dfeault master branch for deployment to heroku
configure email notification on failure
Merge pull request #1 from pussinboots/master

sync master back to designed branch