Modificacion local
Merge branch 'master' of https://github.com/mtugnarelli/Test

Conflicts:
	README2.md
Modificado
Merge remote branch 'origin'