課題31: calc.js変更
課題31: calc.js修正
Merge pull request #59 from flexfrank/team-C1-31

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

Conflicts:
	30/calc.js