colores, estilos y mas
Merge pull request #2 from CarlosLopezP/master

Merge pull request #1 from pabloPM/master
Revert "Merge pull request #1 from pabloPM/master"
Merge pull request #5 from pabloPM/revert-2-master

das
Merge pull request #2 from pabloPM/master

:D