Merge pull request #33 from ricin123/master

拉一下
搜索、名人堂
Merge pull request #88 from kictpov/master

	搜索、名人堂