add both
add both
Merge branch 'master' of https://github.com/mfiari/demogitesgi0711

Conflicts:
	README.md