agrego la pagina configuracionGeneral.html lista

html terminado
Merge remote-tracking branch 'origin/master'

Conflicts:
	css/configuracion.css