System.out.println("hello git! welcome to my app.");
Merge branch 'master' of https://github.com/hhkj/git_test.git

Conflicts:
	src/com/hhkj/pc_mon/APP.java