Updated README
Merge branch 'master' of https://github.com/GregorySchwartz/diversity

Conflicts:
	README.md