update README.md
Merge branch 'develop' of github.com:shifuml/guagua into develop

Conflicts:
	README.md