Solucionado error 8 y 10 del mail
Merge branch 'master' of https://github.com/NaiaraAcosta/GDD2014