Buscador
Merge branch 'master' of https://github.com/EzeroVivanco/Geek_Prueba

Conflicts:
	App Móvil/Thumbs.db
	App Móvil/assets/Thumbs.db
	App Móvil/design/Thumbs.db