merge
Merge branch 'master' of https://github.com/xudafeng/xudafeng.github.com
add