Copy: Add 12
-12
+19
Merge branch 'master' of https://github.com/hungndv/Test

Conflicts:
	file.txt