update
Merge branch 'master' of https://github.com/hahaya/hahaya.github.com