modi hoge@1-dev
modi2
Merge branch 'development'

Conflicts:
	testjava0-1/src/hoge/HogeMain.java