rollback because Heroku is not up to date
Merge branch 'master' of heroku.com:quiet-stream-3207
refactoring