clientes funcional listo
Merge remote-tracking branch 'origin/master'

Conflicts:
	Css/style2.css