update readme
Merge remote-tracking branch 'origin/master' into test-mergetool

Conflicts:
	README.md
Merge remote-tracking branch 'origin/test-mergetool'