Merge branch 'master' of https://github.com/bineanzhou/files

Conflicts:
	README.md

Signed-off-by: bineanzhou <bineanzhou@163.com>
Merge branch 'master' of https://github.com/bineanzhou/files