Resolver conflicto merge
Merge branch 'master' of https://github.com/Muffin-Apps/OnlyAWeek