update
Merge branch 'master' of wfx:wufeixiang/wufeixiang.github.com