Cập nhật
Merge branch 'master' of https://github.com/simkbaio/quantringhilucsong

Conflicts:
	app/views/hello.php