Segunda modificacion
Merge branch 'emllano' of https://github.com/pbenav/pruebas into emllano

Conflicts:
	README.md