commit all
Commit 2nd
Merge branch 'master' of https://github.com/phat-nguyen/testgit

Conflicts:
	phat.txt

Signed-off-by: Phat Nguyen <phat.uit@gmail.com>