マスター更新
Merge remote-tracking branch 'github_140810_git/master' into add_title

Conflicts:
	index.html