Fusionando ambas versiones
Experimentando con ficheros
Merge branch 'master' of https://github.com/Innoto/cogumelo
Probando subidas de ficheros
Merge branch 'master' of https://github.com/Innoto/cogumelo