abc commit
Merge branch 'master' of https://github.com/quynhnguyen1202/DemoGit

Conflicts:
	JavaApplication2/src/javaapplication2/NewJFrame.form
	JavaApplication2/src/javaapplication2/NewJFrame.java
toi commit lai