cambio en campo
Merge branch 'master' of https://github.com/omoraleshlc/configuracionV2

Conflicts:
	baseDatos.php