Merge pull request #7 from danielcfe/master

fixed usuarios and profile page
fix errors
Merge branch 'master' of https://github.com/xleninx/proyecto
Reporte de notas
Merge branch 'master' of https://github.com/xleninx/proyecto

Conflicts:
	application/controllers/download.php