touch foo to restart heroku
Merge branch 'master' of heroku.com:sample-app-rails-tutorial2