sua file test.java
Merge branch 'master' of https://github.com/quynhnguyen1202/DemoGit
abc
Merge branch 'master' of https://github.com/quynhnguyen1202/DemoGit

Conflicts:
	JavaApplication2/src/newpackage/test.java