pull front_end
Merge branch 'master' of https://github.com/hoangnham01/projectPHP

Conflicts:
	app/views/frontend/categories/index.blade.php
pull
Merge branch 'master' of https://github.com/hoangnham01/projectPHP
Merge branch 'master' of https://github.com/hoangnham01/projectPHP
Merge branch 'master' of https://github.com/hoangnham01/projectPHP
favirote, js frontend