update
Merge branch 'gh-pages' of https://github.com/joveth/funny into gh-pages