a
ff
j
h
Merge branch 'master' of https://github.com/hyojinbae/sample.git

Conflicts:
	sample/src/test/Test.java