add hits
Merge branch 'production'

Conflicts:
	application/views/main.php
add search