clase 3 example 3
fix merge
Merge remote-tracking branch 'origin/master'