Contenido.
Merge branch 'master' of https://github.com/victorv977/TallerJavascript

Conflicts:
	README.md