modified:   README.md
Merge branch 'master' of https://github.com/zhaojunbo/linker

Conflicts:
	README.md

	modified:   README.md