mi commit
Merge branch 'master' of https://github.com/AxelCB/Trabajo-Ingenieria-2

Conflicts:
	workspace-php/TrabajoIngenieria/application/handlers/login.php