agregado autocompletaren from de buscar, funciona le faltan detalles
Merge branch 'master' of https://github.com/CharlieRa/SAA

Conflicts:
	public/stylesheets/style.css