課題32　calc.js変更
Merge remote-tracking branch 'remotes/origin/team-C1' into team-C1-32

Conflicts:
	30/calc.js
Merge pull request #60 from flexfrank/team-C1-32

課題32　calc.js変更