Finished searching and results page
Merge branch 'master' of https://github.com/jmeanor/eAuction

Conflicts:
	inc/functions.php
Merge branch 'master' of https://github.com/jmeanor/eAuction