課題10-2
Merge branch 'team-B2' into teamB2-10-2

Conflicts:
	10/color.js
Merge pull request #27 from flexfrank/teamB2-10-2

課題10-2