kkk
Merge branch 'master' of https://github.com/crisgarner/Cromos-Noviembre

Conflicts:
	css/indice-style.css
	css/style.css