tesutoyade
Merge branch 'master' of https://github.com/kanohisa/werewolf

Conflicts:
	test.html