変更
Merge branch 'master' of https://github.com/potproject/bookonproject

Conflicts:
	index.php
	search/new/index.php
	search/ranking/index.php