mi segundo cambio desde la laptop
 Please enter the commit message for your changes. Lines starting
Merge remote-tracking branch 'origin/master'

Conflicts:
	colores.txt