Configurando Git
Merge remote-tracking branch 'syskar/master'