dev
add foo@1
modi hoge@2
Merge remote-tracking branch 'origin/development' into development
modi hoge@1
modi hoge@2
Merge remote-tracking branch 'origin/development' into development

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