Empezando con Core Data
Merge remote-tracking branch 'origin/master'