added by zhangyu
Merge branch 'gh-pages' of https://github.com/Lighter1203/20140202 into gh-pages