2回目テスト
Merge branch 'master' of https://github.com/ktoshihiro/js_no_yube

Conflicts:
	README.txt
Merge branch 'master' of https://github.com/ktoshihiro/js_no_yube