change to zhangjuntao
Merge branch 'master' of https://github.com/JuntaoZhang/test

Conflicts:
	README.md