funciones nuevas
Merge remote-tracking branch 'origin/master'

Conflicts:
	functions/function_tests.php
	functions/functions.php