mainにコメント追加
Merge remote-tracking branch 'origin/Brunch_Matsushita' into branch_shinagawa

Conflicts:
	main.c