add test2
Merge branch 'master' of https://github.com/mingj/testproject