Cambios

Estilos y demases
Merge remote-tracking branch 'origin/Carlos' into Carlos

Conflicts:
	front/css/style.css
	front/index.html
	front/js/script.js
Viernes