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