なぜかうごかなくなった
Merge branch 'master' of https://github.com/qsona/SocketShogi

Conflicts:
	client/views/room_one.js