merge 테스트중
테스트1
Merge branch 'hotfixes/patched' of
https://github.com/LimSungTae/MyProject into hotfixes/patched

Conflicts:
	test/bin/test/Test.class
	test/src/test/Test.java