Merge pull request #1 from ElMarmos/firstmaster

Listo para empezar
Merge remote-tracking branch 'origin/master' into secondmaster