Doce
Mezclado 6 y 12.
Merge branch 'master' of
https://mtugnarelli@github.com/mtugnarelli/Test.git

Conflicts:
	README.md