hieu change hello
Merge branch 'master' of https://github.com/nguyenhieptn/hellogit

Conflicts:
	hello.php
Merge branch 'master' of https://github.com/nguyenhieptn/hellogit

Conflicts:
	hello.php