testing heroku ( -procfile  -:production Thin)
Merge remote-tracking branch 'origin/master'