local updated and conflict removed
Merge remote-tracking branch 'github/master'

Conflicts:
	README.md