search update
up
Merge branch 'master' of https://github.com/fcbaila/Hyperzine

Conflicts:
	search.php