heroku settings added
replacing master
replacing master
replacing master
merge conflicts