選択におけるバグの修正
Merge branch 'koide'

Conflicts:
	js/game.js
Merge branch 'master' into saison

Conflicts:
	js/game.js