Added employeeinfo controller and seed data
Fixed conflicts