Merge pull request #1 from azhoulinux/test1

Test1
edit b
edit b
Merge branch 'master' of https://github.com/azhoulinux/test
edit b
Merge pull request #2 from azhoulinux/test1

Test1
edit b
Merge branch 'master' of https://github.com/azhoulinux/test
edit b
edit b
fix
Merge pull request #4 from azhoulinux/master

a