commit
Signed-off-by: dao <dao1981@gmail.com>
Merge branch 'master' of https://github.com/dao1981/master2

Conflicts:
	.gitignore

Signed-off-by: dao <dao1981@gmail.com>