I got the teammate finder system to work and respond to requests
Fixed merge conflicts