takeda コメント
Merge branch 'master' of ssh://git@github.com/ocs-133305/Team-C.git

Conflicts:
	OOP_Team-C/src/Hello.java