apparently require statements aren't required
Merge branch 'search'

Conflicts:
	lib/bookie.rb
mend