doc
Merge branch 'master' of https://github.com/melin/super-diamond

Conflicts:
	README.md