Conflicto arreglado
Merge branch 'dev' of https://github.com/alessandrofg/miRutina into dev
Merge branch 'dev' of https://github.com/alessandrofg/miRutina into dev
Merge branch 'dev' of https://github.com/alessandrofg/miRutina into dev
Merge branch 'dev' of https://github.com/alessandrofg/miRutina into dev
Inicio con el edit de rutinas
Merge branch 'dev' of https://github.com/alessandrofg/miRutina into dev