Update README.md
Merge branch 'branch'

Conflicts:
	README.md
Merge branch 'master' into branch
Merge remote-tracking branch 'origin/branch' into branch