Adding another good bad joke
Merge branch 'jokes'