説明をちょっと追加しました。
Merge branch 'master' of https://github.com/50river/5374 into gh-pages
ちょっとコメントを追加
Merge branch 'master' of https://github.com/50river/5374 into gh-pages

Conflicts:
	js/script.js
Merge branch 'gh-pages' of https://github.com/50river/5374 into gh-pages

Conflicts:
	js/script.js