The second push!
Merge branch 'master' of https://github.com/fqnchina/test_img

Conflicts:
	.gitignore