commit
Merge branch 'master' of https://github.com/walnutown/ThrdPlace-Search-Engine-And-Recommend-System

Conflicts:
	www/contributors/Klussuv.html
	www/php/search.php