Login
Do some things
Merge branch 'master' of https://github.com/t02itjap/elearning
Pull master to tiendq branch
Conflicts:
	app/Controller/UsersController.php
Merge branch 'tiendq'
Fix!
Conflicts:
	app/Controller/UsersController.php