test commit 1
them file project
add sql folder
Merge branch 'master' of github.com:luoi/phpmock
Merge branch 'master' of github.com:luoi/phpmock
sua product
Merge branch 'master' of https://github.com/luoi/phpmock.git
test brand 1
test push branches
sửa lại upload ảnh phần update product
Thêm link quản lý config ở phần mnenu trong trang admin
ok gitignore
Them megamenu vao trang cart.php trong controller
Merge branch 'master' of https://github.com/luoi/phpmock.git
sua controller cart.php checkout.php
Merge branch 'master' of github.com:luoi/phpmock
back up database
modifile ignore file
Merge branch 'master' of https://github.com/luoi/phpmock.git
product.php controller
Merge branch 'master' of https://github.com/luoi/phpmock.git

Conflicts:
	application/modules/administrator/controllers/product.php