correcciones
linea absurda eliminada
Merge remote-tracking branch 'upstream/master'
comentario eliminado
Merge pull request #7 from jagallud/master

Pequeños cambios