Merge pull request #1 from leoachear/Desarrollo

Prueba Branhes
Merge remote-tracking branch 'origin/Desarrollo'
Merge remote-tracking branch 'origin/Desarrollo'
Merge branch 'master' of https://github.com/leoachear/Puls2014-America
Cambiosde la clase 3