今後の方針に追加
Merge remote-tracking branch 'up/master'

Conflicts:
	README.md
Merge pull request #4 from okbm/master

テスト