update
Merge branch 'master' of https://github.com/huangwei1024/struct_fmt

Conflicts:
	.gitignore