added csv upload in seed file, remember to reindex solar when you do this
Merge branch 'master' of github.com:polyfish42/PeopleDB
Merge branch 'master' of github.com:polyfish42/PeopleDB

Conflicts:
	app/models/employee.rb
	app/views/employees/_filter.html.erb
	app/views/employees/_form.html.erb
	db/schema.rb