Carlos Saenz
Merge branch 'desarrolloCarlos' of https://github.com/cesaenzv/sistemabusqueda into desarrolloCarlos

Conflicts:
	public/js/ranking_module.js

Carlos Saenz