Update README.md
Merge remote-tracking branch 'origin/master' into conflict

Conflicts:
	README.md