coomit local
Merge branch 'master' of https://github.com/PhamVanThuan/test2

Conflicts:
	test2.php