충돌test
Merge remote-tracking branch 'origin/junitTest'

Conflicts:
	eclipse_git_test/src/org/hoi/testHello.java