Merge pull request #15 from Dleonheart/desarrollo

Desarrollo
change Index
merge
Merge branch 'desarrollo' of https://github.com/Dleonheart/sistemabusqueda into Dleonheart-desarrollo

Conflicts:
	application/routes.php

	modified:   application/routes.php
Fixed trouble merging
Merge pull request #10 from cesaenzv/desarrolloCarlos

Desarrollo carlos