adds search activity w search controller, route, model,views
Merge branch 'working'

Conflicts:
	app/views/people/show.html.erb
	config/routes.rb