ajustes
ajustes
Merge branch 'rodrigo' of github.com:rodbustamante/eClass_anexos into rodrigo

Conflicts:
	app/Controller/UsersController.php
	app/Model/UserModel.php
	app/View/Users/index.ctp
Merge pull request #3 from rodbustamante/rodrigo

Ajustes de conflictos