edit git
edit git
f
Merge branch 'master' of https://github.com/thanhtuyen/vaco

Conflicts:
	themes/bootstrap/views/layouts/home.php