Comentario sin importancia para poder hacer git
Merge remote-tracking branch 'upstream/Guille'
Merge remote-tracking branch 'upstream/master' into Guille