prueba

prueba
Merge branch 'master' of https://github.com/adanjz1/zonasVerdes

Conflicts:
	application/config/autoload.php
	application/config/routes.php