Merge branch 'master' of https://github.com/knsv/mermaid

Conflicts:
	README.md