lista 2.0
Merge branch 'master' of https://github.com/m87/joke