Merge branch 'child1' of https://github.com/phanngoc/testgit into child2

Conflicts:
	baitap4/sssdefe

dsdsdsdsd
Revert "dsdsdefafwef"
Da revert rui
This reverts commit 00ccd011e8b007bb0c2015cecc2dce4c808d418c.

Conflicts:
	baitap4/sssdefe
Revert "Add baitap6"

dhis reverts commit 2176682739b37892c25872449af75bcaaf946d8c.
Conflicts:
da thay doi child1 ok
	baitap4/sssdefe