reset
Merge branch 'master' of https://github.com/szanlin/szanlin.github.com
reset 2