Aniadir botones y xml de colores
Merge remote-tracking branch 'origin/master'