update
Merge branch 'gh-pages' of github.com:tianmajs/tianma into gh-pages