Merge pull request #1 from ecabrerar/master

Actualizar Archivo Readme
Merge pull request #2 from ecabrerar/master

Completando los ejercicios faltantes
Merge pull request #3 from ecabrerar/master

Update README.md
Merge pull request #4 from ecabrerar/master

Ejercicio de pruebas unitarias
Add a Bitdeli badge to README
Merge pull request #5 from bitdeli-chef/master

Add a Bitdeli Badge to README
Merge remote-tracking branch 'upstream/master'

Conflicts:
	README.md