.sql OK
Merge remote-tracking branch 'origin/master'

Conflicts:
	Controller/BaseController.php
	baseDeDatos.sql