started on search
Merge branch 'master' of https://github.com/andwiik/epoq

Conflicts:
	wp-content/themes/epoq/page-11.php