Merge remote-tracking branch 'origin/master'

Conflicts:
	README.md

Revert "Update README.md"

This reverts commit
98d5b520f105992791521cb438f4b2106a0ca374.
Merge remote-tracking branch 'origin/master'

Conflicts:
	README.md