修正
Merge branch 'master' of https://github.com/u2ku2k/honkouji

Conflicts:
	app/webroot/img/glossary/glossary_img.png
	app/webroot/img/glossary/h1_glossary.png
追加