reverted back to changes before I tried to publish on heroku
Merge remote-tracking branch 'origin/master'