Hers is Add DIR 'funny' and file funny.*
Modify funny.js
Merge branch 'master' of https://github.com/vanpipy/hello