Fix confict
Ignore tmp file
Merge branch 'master' of github.com:t02itjap/elearning
Ignore files Template
Merge branch 'master' of github.com:t02itjap/elearning
Merge branch 'master' of github.com:t02itjap/elearning
Fix StudentController & get_histories
Merge branch 'thinhnv'
Fix!
Conflicts:
	.gitignore
Merge branch 'thangvm'
Merge branch 'master' of github.com:t02itjap/elearning into thangvm
Merge branch 'thangvm'
Screen Degisn
Merge branch 'tiendq'
Confict temple file from TienDQ.
Conflicts:
	app/Controller/UsersController.php
	app/tmp/cache/models/myapp_cake_model_default_elearning_list
	app/tmp/cache/models/myapp_cake_model_default_elearning_tb_users
	app/tmp/cache/persistent/myapp_cake_core_cake_dev_en-us
	app/tmp/cache/persistent/myapp_cake_core_cake_en-us
	app/tmp/cache/persistent/myapp_cake_core_file_map
	app/tmp/cache/persistent/myapp_cake_core_method_cache
	app/tmp/logs/error.log
Remove tem files!
Screen 20, Lesson view
Merge branch 'master' of github.com:t02itjap/elearning
New Database
ok
Merge branch 'master' of github.com:t02itjap/elearning
ok