seguridad
Merge branch 'master' of https://github.com/xleninx/proyecto

Conflicts:
	application/controllers/download.php