functions2
Resolucion

Conflicts:
	functions.php