probando, 1, 2, 3
adding .gitignore
Merge remote-tracking branch 'choose_remote_name/master'