fix
Merge branch 'master' of heroku.com:mf-hackday
fix
Merge https://github.com/francescozaia/mf-hackday