master branch: bare bones for anyone to start with
Merge remote-tracking branch 'upstream/master'

Conflicts:
	README.md

	modified:   README.md