Merge branch 'search2'

Conflicts:
	db/seeds.rb