Merge https://github.com/aecostas/state-diagram

Conflicts:
	README.md
Merge branch 'master' of https://github.com/aecostas/state-diagram

Conflicts:
	README.md