estructura y estilo
Merge branch 'master' of https://github.com/genval/aci570-cat2

Conflicts:
	app/Config/database.php.default