Them thong bao khi quen pass
Merge branch 'master' into tiendq

Conflicts:
	app/Controller/TeachersController.php
	app/Controller/UsersController.php
sua form login

Conflicts:
	app/Controller/UsersController.php
Merge branch 'master' of https://github.com/t02itjap/elearning
Merge branch 'master' of https://github.com/t02itjap/elearning
Fix Conflict, and Bug in PhiNM Code/
Conflicts:
	app/Controller/UsersController.php