reset and recommit
Merge branch 'master' of https://github.com/seanliu2012/Test