マージ
音声認識機能追加
Merge branch 'master' of
https://github.com/Quramy/ossc-hackathon-ardrone-14.git

Conflicts:
	public/index.html
Merge branch 'master' of https://github.com/Quramy/ossc-hackathon-ardrone-14.git