my modification of style-guide
Merge remote-tracking branch 'github/master'

Conflicts:
	README.md