ok, how about this
Merge branch 'master' of heroku.com:infinite-ocean-7708