busqueda solucionado
Merge origin/master

Conflicts:
	index.html
	nbproject/project.properties
Merge origin/master

Conflicts:
	index.html
	nbproject/project.properties
Merge origin/master

Conflicts:
	administracion_index.html