Explain master vs bootstrap branches
Merge branch 'master' into bootstrap

Conflicts:
	README.md