add fun2
Merge branch 'master' of github.com:lcdsdream/test_git