links
Merge branch 'master' of github.com:f-prettyland/JP-ChickenPeople

Conflicts:
	searchresult.php