Correciones home
nada
fix conflicts
Merge branch 'fazahe-master'