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

Conflicts:
	README.md