added solr search to app. can search by name and email
Added solr seanch for email and names
Added solr to seanch email and names
Fixed stuff

Conflicts:
	.DS_Store
	.gitignore
	Gemfile.lock
	app/models/employee.rb
Merge branch 'master' of https://github.com/polyfish42/PeopleDB into upstream-polyfish42

Conflicts:
	Gemfile
	app/views/employees/index.html.erb
	app/views/employees/show.html.erb
	app/views/layouts/application.html.erb