Added keywords feature
Merge branch 'master' of https://github.com/jmeanor/eAuction

Conflicts:
	shop/results.php