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