mixed reset to commit 3
Merge branch 'master' of https://github.com/ruishanfu/FooPro
commit 5