コミット
Merge branch 'master' of github.com:DDRAGON/stateRecognitionServer

Conflicts:
	imageSendTool.html