.gitignore created by brackets-git extension
subiendo archivos
Merge remote-tracking branch 'NauticaBarata/master'