huhhuhu
Revert "huhhuhu"

This reverts commit d4e1caf553177375c1ec8adbe9bfe4792c74dd8c.
Delele user

Function delete user
Delete Brand

Up code delete Brand (chưa test)
Update Brand

Up Code Brand. --(Chưa test trên project) mới test demo
config database name to FR06_group2
quick update
sm
fix

fix lỗi gọi tên funtion.
ad
Merge branch 'master' of https://github.com/tronghuan/mockprojectfr06

Conflicts:
	.idea/workspace.xml
update brand
ok
Merge remote-tracking branch 'origin/ThinhLD'

Conflicts:
	.idea/workspace.xml
	application/modules/admin/controllers/brand.php
Hoan thành công việc Day 2 Move Category
Them cơ sở dữ liệu
Day34 listproduct va phan trang
1