Deleted database.php
Merge branch 'master' of https://github.com/jairusgit/prueba

Conflicts:
	e-commerce/application/config/database.php