Merge branch 'yitao'
wenbin.js
Merge branch 'master' of https://github.com/j0x7c4/hackstreet