Merge branch 'master' of github.com:shiren1118/shiren1118.github.com into source
add trans