Merge pull request #3 from Aitor1995/primeraRama

Primera rama
Merge pull request #4 from Aitor1995/master

Merge pull request #3 from Aitor1995/primeraRama