なんか修正
Merge branch 'master' of github.com:kumatake/CodeBreaker

Conflicts:
	game.php