Avance 2/3 viernes
ajustes 3/3 viernes

Conflicts:
	style.css