Update README.md
Merge branch 'jingjing'

Conflicts:
	README.md
Merge branch 'master' into jingjing